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

client/tests/kvm/kvm.py

Index: client/tests/kvm/kvm.py
diff --git a/client/tests/kvm/kvm.py b/client/tests/kvm/kvm.py
index b88fd51ab9073beb5edde5d4e6e5692ad0f1f6b7..4af2767ce497daab9060e119d8f2341d5ce14c7c 100644
--- a/client/tests/kvm/kvm.py
+++ b/client/tests/kvm/kvm.py
@@ -27,6 +27,11 @@ class kvm(test.test):
         # 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()