From patchwork Mon Jan 3 18:27:18 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Goldish X-Patchwork-Id: 448661 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 p03IRBb5024206 for ; Mon, 3 Jan 2011 18:27:17 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752654Ab1ACS1K (ORCPT ); Mon, 3 Jan 2011 13:27:10 -0500 Received: from mx1.redhat.com ([209.132.183.28]:12113 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752477Ab1ACS1F (ORCPT ); Mon, 3 Jan 2011 13:27:05 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id p03IR4L0010504 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 3 Jan 2011 13:27:04 -0500 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p03IR4NV011932; Mon, 3 Jan 2011 13:27:04 -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 p03IQeWj027298; Mon, 3 Jan 2011 13:27:03 -0500 From: Michael Goldish To: autotest@test.kernel.org, kvm@vger.kernel.org Cc: Michael Goldish Subject: [KVM-AUTOTEST PATCH 17/17] KVM test: rename path parameters in kvm_vm.copy_files_*() Date: Mon, 3 Jan 2011 20:27:18 +0200 Message-Id: <1294079238-21239-17-git-send-email-mgoldish@redhat.com> In-Reply-To: <1294079238-21239-1-git-send-email-mgoldish@redhat.com> References: <1294079238-21239-1-git-send-email-mgoldish@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 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, 03 Jan 2011 18:27:18 +0000 (UTC) diff --git a/client/tests/kvm/kvm_vm.py b/client/tests/kvm/kvm_vm.py index 4680577..056416e 100755 --- a/client/tests/kvm/kvm_vm.py +++ b/client/tests/kvm/kvm_vm.py @@ -1256,12 +1256,12 @@ class VM: return self.login(nic_index, internal_timeout) - def copy_files_to(self, local_path, remote_path, nic_index=0, timeout=600): + def copy_files_to(self, host_path, guest_path, nic_index=0, timeout=600): """ Transfer files to the remote host(guest). - @param local_path: Host path - @param remote_path: Guest path + @param host_path: Host path + @param guest_path: Guest path @param nic_index: The index of the NIC to connect to. @param timeout: Time (seconds) before giving up on doing the remote copy. @@ -1275,15 +1275,15 @@ class VM: (self.name, address, kvm_utils.generate_random_string(4))) kvm_utils.copy_files_to(address, client, username, password, port, - local_path, remote_path, log_filename, timeout) + host_path, guest_path, log_filename, timeout) - def copy_files_from(self, remote_path, local_path, nic_index=0, timeout=600): + def copy_files_from(self, guest_path, host_path, nic_index=0, timeout=600): """ Transfer files from the guest. - @param local_path: Guest path - @param remote_path: Host path + @param host_path: Guest path + @param guest_path: Host path @param nic_index: The index of the NIC to connect to. @param timeout: Time (seconds) before giving up on doing the remote copy. @@ -1297,8 +1297,7 @@ class VM: (self.name, address, kvm_utils.generate_random_string(4))) kvm_utils.copy_files_from(address, client, username, password, port, - remote_path, local_path, log_filename, - timeout) + guest_path, host_path, log_filename, timeout) def serial_login(self, timeout=10):