From feac11d4d210c7ec658a050a5f6efcc67b885df4 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Fri, 8 Jan 2016 15:03:18 -0800
Subject: [PATCH] drop mistakenly added service manipulation test

I messed up the last commit and mistakenly included this test,
which I've been working on and is not yet reviewed. The commit
was only supposed to add base_services_start. I'll send a new
diff for service_manipulation.
---
 templates                          | 42 ---------------------
 tests/base_service_manipulation.pm | 60 ------------------------------
 2 files changed, 102 deletions(-)
 delete mode 100644 tests/base_service_manipulation.pm

diff --git a/templates b/templates
index caa74c89..382e4ee2 100755
--- a/templates
+++ b/templates
@@ -215,39 +215,6 @@
                                     },
                       test_suite => { name => "base_services_start" },
                     },
-                    {
-                      machine    => { name => "64bit" },
-                      prio       => 40,
-                      product    => {
-                                      arch    => "x86_64",
-                                      distri  => "fedora",
-                                      flavor  => "generic_boot",
-                                      version => "*",
-                                    },
-                      test_suite => { name => "base_service_manipulation" },
-                    },
-                    {
-                      machine    => { name => "64bit" },
-                      prio       => 40,
-                      product    => {
-                                      arch    => "x86_64",
-                                      distri  => "fedora",
-                                      flavor  => "workstation_live",
-                                      version => "*",
-                                    },
-                      test_suite => { name => "base_service_manipulation" },
-                    },
-                    {
-                      machine    => { name => "64bit" },
-                      prio       => 40,
-                      product    => {
-                                      arch    => "x86_64",
-                                      distri  => "fedora",
-                                      flavor  => "server_dvd",
-                                      version => "*",
-                                    },
-                      test_suite => { name => "base_service_manipulation" },
-                    },
                     {
                       machine    => { name => "64bit" },
                       prio       => 30,
@@ -1320,14 +1287,5 @@
                         { key => "HDD_1", value => "disk_%FLAVOR%_%MACHINE%.qcow2" },
                       ],
                     },
-                    {
-                      name => "base_service_manipulation",
-                      settings => [
-                        { key => "ENTRYPOINT", value => "base_service_manipulation" },
-                        { key => "START_AFTER_TEST", value => "default_install" },
-                        { key => "BOOTFROM", value => "c" },
-                        { key => "HDD_1", value => "disk_%FLAVOR%_%MACHINE%.qcow2" },
-                      ],
-                    },
                   ],
 }
diff --git a/tests/base_service_manipulation.pm b/tests/base_service_manipulation.pm
deleted file mode 100644
index 191c3c13..00000000
--- a/tests/base_service_manipulation.pm
+++ /dev/null
@@ -1,60 +0,0 @@
-use base "installedtest";
-use strict;
-use testapi;
-
-sub run {
-    my $self=shift;
-    # wait for boot to complete
-    $self->boot_to_login_screen("", 30);
-    # switch to TTY3 for both, graphical and console tests
-    $self->root_console(tty=>3);
-    # we could make this slightly more 'efficient' by assuming sshd
-    # is always going to be enabled/running at first, but it's safer
-    # to force an expected starting state.
-    script_run "systemctl stop sshd.service";
-    script_run "systemctl disable sshd.service";
-    script_run "reboot";
-    $self->boot_to_login_screen("", 30);
-    $self->root_console(tty=>3);
-    validate_script_output 'systemctl is-enabled sshd.service', sub { $_ =~ m/disabled/ };
-    validate_script_output 'systemctl is-active sshd.service', sub { $_ =~ m/inactive/ };
-    validate_script_output 'ps -C sshd', sub { $_ !~ m/sshd/ };
-    script_run "systemctl start sshd.service";
-    validate_script_output 'systemctl is-enabled sshd.service', sub { $_ =~ m/disabled/ };
-    validate_script_output 'systemctl is-active sshd.service', sub { $_ =~ m/active/ };
-    validate_script_output 'ps -C sshd', sub { $_ =~ m/sshd/ };
-    script_run "systemctl stop sshd.service";
-    validate_script_output 'systemctl is-enabled sshd.service', sub { $_ =~ m/disabled/ };
-    validate_script_output 'systemctl is-active sshd.service', sub { $_ =~ m/inactive/ };
-    validate_script_output 'ps -C sshd', sub { $_ !~ m/sshd/ };
-    script_run "systemctl enable sshd.service";
-    validate_script_output 'systemctl is-enabled sshd.service', sub { $_ =~ m/enabled/ };
-    validate_script_output 'systemctl is-active sshd.service', sub { $_ =~ m/inactive/ };
-    validate_script_output 'ps -C sshd', sub { $_ !~ m/sshd/ };
-    script_run "reboot";
-    $self->boot_to_login_screen("", 30);
-    $self->root_console(tty=>3);
-    validate_script_output 'systemctl is-enabled sshd.service', sub { $_ =~ m/enabled/ };
-    validate_script_output 'systemctl is-active sshd.service', sub { $_ =~ m/active/ };
-    validate_script_output 'ps -C sshd', sub { $_ =~ m/sshd/ };
-    script_run "systemctl disable sshd.service";
-    script_run "reboot";
-    $self->boot_to_login_screen("", 30);
-    $self->root_console(tty=>3);
-    validate_script_output 'systemctl is-enabled sshd.service', sub { $_ =~ m/disabled/ };
-    validate_script_output 'systemctl is-active sshd.service', sub { $_ =~ m/inactive/ };
-    validate_script_output 'ps -C sshd', sub { $_ !~ m/sshd/ };
-}
-
-
-sub test_flags {
-    # without anything - rollback to 'lastgood' snapshot if failed
-    # 'fatal' - whole test suite is in danger if this fails
-    # 'milestone' - after this test succeeds, update 'lastgood'
-    # 'important' - if this fails, set the overall state to 'fail'
-    return { fatal => 1 };
-}
-
-1;
-
-# vim: set sw=4 et: