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

client/tests/kvm/tests/iofuzz.py

Index: client/tests/kvm/tests/iofuzz.py
diff --git a/client/tests/kvm/tests/iofuzz.py b/client/tests/kvm/tests/iofuzz.py
index 7189f91aa9b2345fcb1890e532cfd9a8774d8f74..ea25ba26d61dc1520136299bf1fb190af27d55ec 100644
--- a/client/tests/kvm/tests/iofuzz.py
+++ b/client/tests/kvm/tests/iofuzz.py
@@ -84,8 +84,8 @@ def run_iofuzz(test, params, env):
                         logging.debug("Could not re-login, reboot the guest")
                         session = vm.reboot(method="system_reset")
                 else:
-                    raise error.TestFail("VM has quit abnormally during %s",
-                                         (op, operand))
+                    raise error.TestFail("VM has quit abnormally during "
+                                         "%s: %s" % (op, operand))
 
 
     login_timeout = float(params.get("login_timeout", 240))