Revert "Merge remote branch 'cros/upstream' into autotest-rebase"

client/tests/kvm/tests/iozone_windows.py

 import logging, time, os
 from autotest_lib.client.common_lib import error
 from autotest_lib.client.bin import utils
 from autotest_lib.client.tests.iozone import postprocessing
 import kvm_subprocess, kvm_test_utils, kvm_utils
 
 
 def run_iozone_windows(test, params, env):
     """
     Run IOzone for windows on a windows guest:
@@ skipping 10 matching lines @@
     timeout = int(params.get("login_timeout", 360))
     session = kvm_test_utils.wait_for_login(vm, timeout=timeout)
     results_path = os.path.join(test.resultsdir,
                                 'raw_output_%s' % test.iteration)
     analysisdir = os.path.join(test.resultsdir, 'analysis_%s' % test.iteration)
 
     # Run IOzone and record its results
     c = params.get("iozone_cmd")
     t = int(params.get("iozone_timeout"))
     logging.info("Running IOzone command on guest, timeout %ss", t)
-    results = session.cmd_output(command=c, timeout=t,
-                                 print_func=logging.debug)
+    results = session.get_command_output(command=c, timeout=t,
+                                         print_func=logging.debug)
     utils.open_write_close(results_path, results)
 
     # Postprocess the results using the IOzone postprocessing module
     logging.info("Iteration succeed, postprocessing")
     a = postprocessing.IOzoneAnalyzer(list_files=[results_path],
                                       output_dir=analysisdir)
     a.analyze()
     p = postprocessing.IOzonePlotter(results_file=results_path,
                                      output_dir=analysisdir)
     p.plot_all()