summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorlmr <lmr@592f7852-d20e-0410-864c-8624ca9c26a4>2010-02-03 18:15:12 +0000
committerlmr <lmr@592f7852-d20e-0410-864c-8624ca9c26a4>2010-02-03 18:15:12 +0000
commita6f6f90eabfbe313eeb4ce34afc2605ac53a64dd (patch)
treec0d7a749951aec7228dbbf869af581832b18d54f /client
parent7843b157e56e354fd0cfe483702c58aa4437d9b1 (diff)
KVM test: Make sure reset and shutdown are the last ones
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. Signed-off-by: Lucas Meneghel Rodrigues <lmr@redhat.com> git-svn-id: svn://test.kernel.org/autotest/trunk@4190 592f7852-d20e-0410-864c-8624ca9c26a4
Diffstat (limited to 'client')
-rw-r--r--client/tests/kvm/tests_base.cfg.sample42
1 files changed, 23 insertions, 19 deletions
diff --git a/client/tests/kvm/tests_base.cfg.sample b/client/tests/kvm/tests_base.cfg.sample
index f2c36558..7f2c41de 100644
--- a/client/tests/kvm/tests_base.cfg.sample
+++ b/client/tests/kvm/tests_base.cfg.sample
@@ -237,25 +237,6 @@ variants:
- fmt_raw:
image_format_stg = raw
- - system_reset: install setup unattended_install
- type = boot
- reboot_method = system_reset
- sleep_before_reset = 20
- kill_vm_on_error = yes
-
- - system_powerdown: install setup unattended_install
- type = shutdown
- shutdown_method = system_powerdown
- sleep_before_powerdown = 20
- kill_vm = yes
- kill_vm_gracefully = no
-
- - shutdown: install setup unattended_install
- type = shutdown
- 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
@@ -272,6 +253,29 @@ variants:
type = physical_resources_check
catch_uuid_cmd = dmidecode | awk -F: '/UUID/ {print $2}'
+ # system_powerdown, system_reset and shutdown *must* be the last ones
+ # defined (in this order), since the effect of such tests can leave
+ # the VM on a bad state.
+ - system_powerdown: install setup unattended_install
+ type = shutdown
+ shutdown_method = system_powerdown
+ sleep_before_powerdown = 20
+ kill_vm = yes
+ kill_vm_gracefully = no
+
+ - system_reset: install setup unattended_install
+ type = boot
+ reboot_method = system_reset
+ sleep_before_reset = 20
+ kill_vm_on_error = yes
+
+ - shutdown: install setup unattended_install
+ type = shutdown
+ shutdown_method = shell
+ kill_vm = yes
+ kill_vm_gracefully = no
+ # Do not define test variants below shutdown
+
# NICs
variants:
- @rtl8139: