From patchwork Wed Nov 4 14:05:42 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Goldish X-Patchwork-Id: 57586 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nA4E8YuO020643 for ; Wed, 4 Nov 2009 14:08:34 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756345AbZKDOI1 (ORCPT ); Wed, 4 Nov 2009 09:08:27 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756347AbZKDOI1 (ORCPT ); Wed, 4 Nov 2009 09:08:27 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48000 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756343AbZKDOI0 (ORCPT ); Wed, 4 Nov 2009 09:08:26 -0500 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nA4E8VAx026118; Wed, 4 Nov 2009 09:08:31 -0500 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id nA4E8UmA016369; Wed, 4 Nov 2009 09:08:31 -0500 Received: from localhost.localdomain (dhcp-1-188.tlv.redhat.com [10.35.1.188]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id nA4E897E029198; Wed, 4 Nov 2009 09:08:27 -0500 From: Michael Goldish To: autotest@test.kernel.org, kvm@vger.kernel.org Cc: Michael Goldish Subject: [KVM-AUTOTEST PATCH 6/6] KVM test: add -o PreferredAuthentications=password to SSH options Date: Wed, 4 Nov 2009 16:05:42 +0200 Message-Id: <1257343542-27902-6-git-send-email-mgoldish@redhat.com> In-Reply-To: <1257343542-27902-5-git-send-email-mgoldish@redhat.com> References: <1257343542-27902-1-git-send-email-mgoldish@redhat.com> <1257343542-27902-2-git-send-email-mgoldish@redhat.com> <1257343542-27902-3-git-send-email-mgoldish@redhat.com> <1257343542-27902-4-git-send-email-mgoldish@redhat.com> <1257343542-27902-5-git-send-email-mgoldish@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org diff --git a/client/tests/kvm/kvm_utils.py b/client/tests/kvm/kvm_utils.py index b9219f6..bf25900 100644 --- a/client/tests/kvm/kvm_utils.py +++ b/client/tests/kvm/kvm_utils.py @@ -551,7 +551,8 @@ def scp_to_remote(host, port, username, password, local_path, remote_path, @return: True on success and False on failure. """ - command = ("scp -o UserKnownHostsFile=/dev/null -r -P %s %s %s@%s:%s" % + command = ("scp -o UserKnownHostsFile=/dev/null " + "-o PreferredAuthentications=password -r -P %s %s %s@%s:%s" % (port, local_path, username, host, remote_path)) return remote_scp(command, password, timeout) @@ -571,7 +572,8 @@ def scp_from_remote(host, port, username, password, remote_path, local_path, @return: True on success and False on failure. """ - command = ("scp -o UserKnownHostsFile=/dev/null -r -P %s %s@%s:%s %s" % + command = ("scp -o UserKnownHostsFile=/dev/null " + "-o PreferredAuthentications=password -r -P %s %s@%s:%s %s" % (port, username, host, remote_path, local_path)) return remote_scp(command, password, timeout) @@ -589,7 +591,8 @@ def ssh(host, port, username, password, prompt, linesep="\n", timeout=10): @return: kvm_spawn object on success and None on failure. """ - command = ("ssh -o UserKnownHostsFile=/dev/null -p %s %s@%s" % + command = ("ssh -o UserKnownHostsFile=/dev/null " + "-o PreferredAuthentications=password -p %s %s@%s" % (port, username, host)) return remote_login(command, password, prompt, linesep, timeout)