Merge remote branch 'autotest-upstream/master' into autotest-merge

client/tests/kvm/kvm.py

 import os, logging, imp
 from autotest_lib.client.bin import test
 from autotest_lib.client.common_lib import error
 import kvm_utils, kvm_preprocessing
 
 
 class kvm(test.test):
     """
     Suite of KVM virtualization functional tests.
     Contains tests for testing both KVM kernel code and userspace code.
 
     @copyright: Red Hat 2008-2009
     @author: Uri Lublin (uril@redhat.com)
     @author: Dror Russo (drusso@redhat.com)
     @author: Michael Goldish (mgoldish@redhat.com)
     @author: David Huff (dhuff@redhat.com)
     @author: Alexey Eromenko (aeromenk@redhat.com)
     @author: Mike Burns (mburns@redhat.com)
 
     @see: http://www.linux-kvm.org/page/KVM-Autotest/Client_Install
             (Online doc - Getting started with KVM testing)
     """
     version = 1
     env_version = 1
 
     def run_once(self, params):
         # Convert params to a Params object
         params = kvm_utils.Params(params)
 
+        # If a dependency test prior to this test has failed, let's fail
+        # it right away as TestNA.
+        if params.get("dependency_failed") == 'yes':
+            raise error.TestNAError("Test dependency failed")
+
         # Report the parameters we've received and write them as keyvals
         logging.debug("Test parameters:")
         keys = params.keys()
         keys.sort()
         for key in keys:
             logging.debug("    %s = %s", key, params[key])
             self.write_test_keyval({key: params[key]})
 
         # Set the log file dir for the logging mechanism used by kvm_subprocess
         # (this must be done before unpickling env)
@@ skipping 68 matching lines @@
             for vm in env.get_all_vms():
                 if vm.is_dead():
                     continue
                 logging.info("VM '%s' is alive.", vm.name)
                 for m in vm.monitors:
                     logging.info("'%s' has a %s monitor unix socket at: %s",
                                  vm.name, m.protocol, m.filename)
                 logging.info("The command line used to start '%s' was:\n%s",
                              vm.name, vm.make_qemu_command())
             raise error.JobError("Abort requested (%s)" % e)