diff mbox

[KVM-AUTOTEST,2/2] KVM test: include shutdown test in kvm_tests.cfg.sample

Message ID fade2a403918d24d91259796cf25212251706a86.1245137635.git.mgoldish@redhat.com (mailing list archive)
State New, archived
Headers show

Commit Message

Michael Goldish June 16, 2009, 7:37 a.m. UTC
The shutdown test should always be last -- new tests will be added above it.

If the user chooses to run all tests on a guest, the guest will be shut down
by the final shutdown test.  If the user selects a specific subset of the tests,
the guest will shut down if the shutdown test is included in this subset.
Note that this only applies to the last guest of the job; since currently all
guests use the same VM object (vm1), the VM is shut down automatically when
it's passed from one guest to the next.

In short, standard test sets (weekly, daily, per-release) should include the
shutdown test.  In particular, tests running from the server should include it.
Custom test sets run in client mode, intended for testing/developing a specific
test or a set of tests, may run without the shutdown test.

The shutdown test is defined with 'kill_vm = yes', so if the test fails to shut
the guest down nicely, the postprocessor will take care of it.

Also added 'kill_vm_on_error = yes' to 'setup' tests, because if a setup test
fails, shutdown will not run, so the setup test must take care of shutting the
VM down.  Install tests already have this defined.

Signed-off-by: Michael Goldish <mgoldish@redhat.com>
---
 client/tests/kvm/kvm_tests.cfg.sample |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)
diff mbox

Patch

diff --git a/client/tests/kvm/kvm_tests.cfg.sample b/client/tests/kvm/kvm_tests.cfg.sample
index 54c9975..412c4b0 100644
--- a/client/tests/kvm/kvm_tests.cfg.sample
+++ b/client/tests/kvm/kvm_tests.cfg.sample
@@ -41,6 +41,7 @@  variants:
         fail_if_stuck_for = 300
         stuck_detection_history = 2
         keep_screendump_history = yes
+        kill_vm_on_error = yes
 
     - boot:         install setup
         type = boot
@@ -83,6 +84,12 @@  variants:
     - linux_s3:      install setup
         type = linux_s3
 
+    - shutdown:      install setup
+        type = shutdown
+        kill_vm = yes
+        kill_vm_gracefully = no
+
+
 # NICs
 variants:
     - @rtl8139:
@@ -544,7 +551,7 @@  variants:
         only default
         only up
         only Fedora.8.32
-        only install setup boot
+        only install setup boot shutdown
         only rtl8139
     - @sample1:
         only qcow2