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

client/tests/kvm/tests/file_transfer.py

Index: client/tests/kvm/tests/file_transfer.py
diff --git a/client/tests/kvm/tests/file_transfer.py b/client/tests/kvm/tests/file_transfer.py
index f02078e854547d50e6dd7976aaa3ee0e6cb6b973..e872beda17569d8644b521085b89445bda73584f 100644
--- a/client/tests/kvm/tests/file_transfer.py
+++ b/client/tests/kvm/tests/file_transfer.py
@@ -24,17 +24,13 @@ def run_file_transfer(test, params, env):
     if not session:
         raise error.TestFail("Could not log into guest '%s'" % vm.name)
 
-    dir_name = test.tmpdir
+    dir = test.tmpdir
     transfer_timeout = int(params.get("transfer_timeout"))
     transfer_type = params.get("transfer_type")
     tmp_dir = params.get("tmp_dir", "/tmp/")
     clean_cmd = params.get("clean_cmd", "rm -f")
     filesize = int(params.get("filesize", 4000))
-    count = int(filesize / 10)
-    if count == 0:
-        count = 1
-    cmd = "dd if=/dev/zero of=%s/a.out bs=10M count=%d" % (dir_name,
-                                                           count)
+    cmd = "dd if=/dev/urandom of=%s/a.out bs=1M count=%d" % (dir, filesize)
     guest_path = tmp_dir + "b.out"
 
     try:
@@ -45,7 +41,7 @@ def run_file_transfer(test, params, env):
             logging.info("Transfering file host -> guest, timeout: %ss",
                          transfer_timeout)
             t_begin = time.time()
-            success = vm.copy_files_to("%s/a.out" % dir_name, guest_path,
+            success = vm.copy_files_to("%s/a.out" % dir, guest_path,
                                        timeout=transfer_timeout)
             t_end = time.time()
             throughput = filesize / (t_end - t_begin)
@@ -57,7 +53,7 @@ def run_file_transfer(test, params, env):
             logging.info("Transfering file guest -> host, timeout: %ss",
                          transfer_timeout)
             t_begin = time.time()
-            success = vm.copy_files_from(guest_path, "%s/c.out" % dir_name,
+            success = vm.copy_files_from(guest_path, "%s/c.out" % dir,
                                          timeout=transfer_timeout)
             t_end = time.time()
             throughput = filesize / (t_end - t_begin)
@@ -70,12 +66,12 @@ def run_file_transfer(test, params, env):
                                   transfer_type)
 
         for f in ['a.out', 'c.out']:
-            p = os.path.join(dir_name, f)
+            p = os.path.join(dir, f)
             size = os.path.getsize(p)
             logging.debug('Size of %s: %sB', f, size)
 
-        md5_orig = utils.hash_file("%s/a.out" % dir_name, method="md5")
-        md5_new = utils.hash_file("%s/c.out" % dir_name, method="md5")
+        md5_orig = utils.hash_file("%s/a.out" % dir, method="md5")
+        md5_new = utils.hash_file("%s/c.out" % dir, method="md5")
 
         if md5_orig != md5_new:
             raise error.TestFail("File changed after transfer host -> guest "
@@ -84,11 +80,11 @@ def run_file_transfer(test, params, env):
     finally:
         logging.info('Cleaning temp file on guest')
         clean_cmd += " %s" % guest_path
-        session.cmd(clean_cmd)
+        s, o = session.get_command_status_output(clean_cmd)
+        if s:
+            logging.warning("Failed to clean remote file %s, output:%s",
+                            guest_path, o)
         logging.info('Cleaning temp files on host')
-        try:
-            os.remove('%s/a.out' % dir_name)
-            os.remove('%s/c.out' % dir_name)
-        except OSError:
-            pass
+        os.remove('%s/a.out' % dir)
+        os.remove('%s/c.out' % dir)
         session.close()