From: Michael Goldish Subject: [KVM-AUTOTEST PATCH 07/28] KVM test: migration_with_file_transfer: use unique host filename Date: Mon, 27 Dec 2010 18:01:34 +0200 Message-ID: <1293465715-16599-7-git-send-email-mgoldish@redhat.com> References: <1293465715-16599-1-git-send-email-mgoldish@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: autotest@test.kernel.org, kvm@vger.kernel.org Return-path: In-Reply-To: <1293465715-16599-1-git-send-email-mgoldish@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: autotest-bounces@test.kernel.org Errors-To: autotest-bounces@test.kernel.org List-Id: kvm.vger.kernel.org If the same constant filename is used every time, multiple instances of the test cannot run concurrently. Signed-off-by: Michael Goldish --- .../kvm/tests/migration_with_file_transfer.py | 12 +++++++----- client/tests/kvm/tests_base.cfg.sample | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) 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: -- 1.7.3.3