Merge remote branch 'origin/upstream' into tempbranch

client/tests/kvm/kvm_test_utils.py

 """
 High-level KVM test utility functions.
 
 This module is meant to reduce code size by performing common test procedures.
 Generally, code here should look like test code.
 More specifically:
     - Functions in this module should raise exceptions if things go wrong
       (unlike functions in kvm_utils.py and kvm_vm.py which report failure via
       their returned values).
     - Functions in this module may use logging.info(), in addition to
@@ skipping 280 matching lines @@
 
     def extract(vm, remote_path, dest_dir="."):
         """
         Extract a .tar.bz2 file on the guest.
 
         @param vm: VM object
         @param remote_path: Remote file path
         @param dest_dir: Destination dir for the contents
         """
         basename = os.path.basename(remote_path)
-        logging.info("Extracting %s..." % basename)
+        logging.info("Extracting %s...", basename)
         (status, output) = session.get_command_status_output(
                                   "tar xjvf %s -C %s" % (remote_path, dest_dir))
         if status != 0:
             logging.error("Uncompress output:\n%s" % output)
-            raise error.TestFail("Could not extract % on guest")
+            raise error.TestFail("Could not extract %s on guest" % basename)
 
     if not os.path.isfile(control_path):
         raise error.TestError("Invalid path to autotest control file: %s" %
                               control_path)
 
     tarred_autotest_path = "/tmp/autotest.tar.bz2"
     tarred_test_path = "/tmp/%s.tar.bz2" % test_name
 
     # To avoid problems, let's make the test use the current AUTODIR
     # (autotest client path) location
@@ skipping 32 matching lines @@
     session.get_command_output("mkdir -p %s" % tests_path)
 
     # Extract <test_name>.tar.bz2 into autotest/tests
     extract(vm, tarred_test_path, "/")
 
     if not vm.copy_files_to(control_path,
                             os.path.join(autotest_path, 'control')):
         raise error.TestFail("Could not copy the test control file to guest")
 
     # Run the test
-    logging.info("Running test '%s'..." % test_name)
+    logging.info("Running test '%s'...", test_name)
     session.get_command_output("cd %s" % autotest_path)
     session.get_command_output("rm -f control.state")
     session.get_command_output("rm -rf results/*")
     logging.info("---------------- Test output ----------------")
     status = session.get_command_status("bin/autotest control",
                                         timeout=timeout,
                                         print_func=logging.info)
-    logging.info("--------------End of test output ------------")
+    logging.info("------------- End of test output ------------")
     if status is None:
         raise error.TestFail("Timeout elapsed while waiting for autotest to "
                              "complete")
 
     # Get the results generated by autotest
     output = session.get_command_output("cat results/*/status")
     results = scan_results.parse_results(output)
     session.close
 
     # Copy test results to the local bindir/guest_results
@@ skipping 17 matching lines @@
     bad_results += [r for r in results if r[1] == "ABORT"]
 
     # Fail the test if necessary
     if not results:
         raise error.TestFail("Test '%s' did not produce any recognizable "
                              "results" % test_name)
     if bad_results:
         result = bad_results[0]
         raise error.TestFail("Test '%s' ended with %s (reason: '%s')"
                              % (result[0], result[1], result[3]))