[3/6] KVM test: Make sure reset and shutdown are the last ones

Commit Message

Lucas Meneghel Rodrigues Jan. 29, 2010, 6:07 a.m. UTC

None

Patch

diff --git a/client/tests/kvm/tests_base.cfg.sample b/client/tests/kvm/tests_base.cfg.sample
index 8a7a13d..fdd04cb 100644
--- a/client/tests/kvm/tests_base.cfg.sample
+++ b/client/tests/kvm/tests_base.cfg.sample
@@ -236,6 +236,24 @@  variants:
             - fmt_raw:
                 image_format_stg = raw
 
+    - vlan_tag:  install setup unattended_install
+        type = vlan_tag
+        # subnet should not be used by host
+        subnet = 192.168.123
+        vlans = "10 20"
+        nic_mode = tap
+        vms += " vm2"
+        extra_params_vm1 += " -snapshot"
+        extra_params_vm2 += " -snapshot"
+        kill_vm_gracefully_vm2 = no
+        address_index_vm2 = 1
+
+    - physical_resources_check: install setup unattended_install
+        type = physical_resources_check
+        catch_uuid_cmd = dmidecode | awk -F: '/UUID/ {print $2}'
+
+    # system_reset, system_powerdown and shutdown *must* be the last ones
+    # defined, since the effect of such tests can leave the VM on a bad state.
     - system_reset: install setup unattended_install
         type = boot
         reboot_method = system_reset
@@ -254,22 +272,7 @@  variants:
         shutdown_method = shell
         kill_vm = yes
         kill_vm_gracefully = no
-
-    - vlan_tag:  install setup unattended_install
-        type = vlan_tag
-        # subnet should not be used by host
-        subnet = 192.168.123
-        vlans = "10 20"
-        nic_mode = tap
-        vms += " vm2"
-        extra_params_vm1 += " -snapshot"
-        extra_params_vm2 += " -snapshot"
-        kill_vm_gracefully_vm2 = no
-        address_index_vm2 = 1
-
-    - physical_resources_check: install setup unattended_install
-        type = physical_resources_check
-        catch_uuid_cmd = dmidecode | awk -F: '/UUID/ {print $2}'
+    # Do not define test variants below shutdown
 
 # NICs
 variants: