[KVM-AUTOTEST,07/28] KVM test: migration_with_file_transfer: use unique host filename

Commit Message

Michael Goldish Dec. 27, 2010, 4:01 p.m. UTC

None

Patch

diff --git a/client/tests/kvm/tests/migration_with_file_transfer.py b/client/tests/kvm/tests/migration_with_file_transfer.py
index 3fb4945..73e70b9 100644
--- a/client/tests/kvm/tests/migration_with_file_transfer.py
+++ b/client/tests/kvm/tests/migration_with_file_transfer.py
@@ -34,17 +34,19 @@  def run_migration_with_file_transfer(test, params, env):
     log_filename = ("migration-transfer-%s-to-%s-%s.log" %
                     (vm.name, address,
                      kvm_utils.generate_random_string(4)))
-    guest_path = params.get("guest_path", "/tmp")
+    host_path = "/tmp/file-%s" % kvm_utils.generate_random_string(6)
+    guest_path = params.get("guest_path", "/tmp/file")
     file_size = params.get("file_size", "1000")
     transfer_timeout = int(params.get("transfer_timeout", "240"))
 
     try:
-        utils.run("dd if=/dev/zero of=/tmp/file bs=1M count=%s" % file_size)
+        utils.run("dd if=/dev/zero of=%s bs=1M count=%s" % (host_path,
+                                                            file_size))
 
         # Transfer file from host to guest in the backgroud
         bg = kvm_utils.Thread(kvm_utils.copy_files_to,
                               (address, client, username, password, port,
-                               "/tmp/file", guest_path, log_filename,
+                               host_path, guest_path, log_filename,
                                transfer_timeout))
         bg.start()
         try:
@@ -59,5 +61,5 @@  def run_migration_with_file_transfer(test, params, env):
 
     finally:
         session.close()
-        if os.path.isfile("/tmp/file"):
-            os.remove("/tmp/file")
+        if os.path.isfile(host_path):
+            os.remove(host_path)
diff --git a/client/tests/kvm/tests_base.cfg.sample b/client/tests/kvm/tests_base.cfg.sample
index 4075bfc..06cb063 100644
--- a/client/tests/kvm/tests_base.cfg.sample
+++ b/client/tests/kvm/tests_base.cfg.sample
@@ -1598,7 +1598,7 @@  variants:
             migration_bg_check_command = tasklist | find /I "ping.exe"
             migration_bg_kill_command = taskkill /IM ping.exe /F
         migrate.with_file_transfer:
-            guest_path = C:\
+            guest_path = C:\tmpfile
             rtl8139:
                 file_size = 10
         stress_boot: