From patchwork Mon Jan 3 18:27:17 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Goldish X-Patchwork-Id: 448641 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 p03IRBb3024206 for ; Mon, 3 Jan 2011 18:27:13 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752599Ab1ACS1G (ORCPT ); Mon, 3 Jan 2011 13:27:06 -0500 Received: from mx1.redhat.com ([209.132.183.28]:58517 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752425Ab1ACS1E (ORCPT ); Mon, 3 Jan 2011 13:27:04 -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 p03IR3x0025666 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 3 Jan 2011 13:27:03 -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 p03IR3H6011927; Mon, 3 Jan 2011 13:27:03 -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 p03IQeWi027298; Mon, 3 Jan 2011 13:27:02 -0500 From: Michael Goldish To: autotest@test.kernel.org, kvm@vger.kernel.org Cc: Michael Goldish Subject: [KVM-AUTOTEST PATCH 16/17] KVM test: reorder kvm_utils.copy_files_from() path parameters Date: Mon, 3 Jan 2011 20:27:17 +0200 Message-Id: <1294079238-21239-16-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:14 +0000 (UTC) diff --git a/client/tests/kvm/kvm_utils.py b/client/tests/kvm/kvm_utils.py index cb79c59..646d4fa 100644 --- a/client/tests/kvm/kvm_utils.py +++ b/client/tests/kvm/kvm_utils.py @@ -808,16 +808,16 @@ def copy_files_to(address, client, username, password, port, local_path, c.close() -def copy_files_from(address, client, username, password, port, local_path, - remote_path, log_filename=None, timeout=600): +def copy_files_from(address, client, username, password, port, remote_path, + local_path, log_filename=None, timeout=600): """ Copy files from a remote host (guest) using the selected client. @param client: Type of transfer client @param username: Username (if required) @param password: Password (if requried) - @param local_path: Path on the local machine where we are copying from - @param remote_path: Path on the remote machine where we are copying to + @param remote_path: Path on the remote machine where we are copying from + @param local_path: Path on the local machine where we are copying to @param address: Address of remote host(guest) @param log_filename: If specified, log all output to this file @param timeout: The time duration (in seconds) to wait for the transfer to diff --git a/client/tests/kvm/kvm_vm.py b/client/tests/kvm/kvm_vm.py index d6ca782..4680577 100755 --- a/client/tests/kvm/kvm_vm.py +++ b/client/tests/kvm/kvm_vm.py @@ -1297,7 +1297,7 @@ class VM: (self.name, address, kvm_utils.generate_random_string(4))) kvm_utils.copy_files_from(address, client, username, password, port, - local_path, remote_path, log_filename, + remote_path, local_path, log_filename, timeout)