From patchwork Mon Dec 27 16:01:34 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Goldish X-Patchwork-Id: 434361 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oBRKCV9V025997 for ; Mon, 27 Dec 2010 20:16:53 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754335Ab0L0QCS (ORCPT ); Mon, 27 Dec 2010 11:02:18 -0500 Received: from mx1.redhat.com ([209.132.183.28]:22321 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754344Ab0L0QCP (ORCPT ); Mon, 27 Dec 2010 11:02:15 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id oBRG2E10029892 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 27 Dec 2010 11:02:14 -0500 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id oBRG2DMI031752; Mon, 27 Dec 2010 11:02:13 -0500 Received: from moof.tlv.redhat.com (dhcp-1-185.tlv.redhat.com [10.35.1.185]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id oBRG1rFt017175; Mon, 27 Dec 2010 11:02:12 -0500 From: Michael Goldish To: autotest@test.kernel.org, kvm@vger.kernel.org Cc: 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> In-Reply-To: <1293465715-16599-1-git-send-email-mgoldish@redhat.com> References: <1293465715-16599-1-git-send-email-mgoldish@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Mon, 27 Dec 2010 20:16:53 +0000 (UTC) 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: