From patchwork Mon Dec 27 16:01:42 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Goldish X-Patchwork-Id: 434481 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 oBRKCV9b025997 for ; Mon, 27 Dec 2010 20:16:55 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754370Ab0L0QC0 (ORCPT ); Mon, 27 Dec 2010 11:02:26 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52205 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754369Ab0L0QCZ (ORCPT ); Mon, 27 Dec 2010 11:02:25 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id oBRG2OOD030089 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 27 Dec 2010 11:02:25 -0500 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id oBRG2OZ9003604; Mon, 27 Dec 2010 11:02:24 -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 oBRG1rG3017175; Mon, 27 Dec 2010 11:02:23 -0500 From: Michael Goldish To: autotest@test.kernel.org, kvm@vger.kernel.org Cc: Michael Goldish Subject: [KVM-AUTOTEST PATCH 15/28] KVM test: kvm_subprocess.py: increase default timeout from 30 to 60 secs Date: Mon, 27 Dec 2010 18:01:42 +0200 Message-Id: <1293465715-16599-15-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.68 on 10.5.11.23 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:55 +0000 (UTC) diff --git a/client/tests/kvm/kvm_subprocess.py b/client/tests/kvm/kvm_subprocess.py index a60eaf6..c3e2dd7 100755 --- a/client/tests/kvm/kvm_subprocess.py +++ b/client/tests/kvm/kvm_subprocess.py @@ -940,7 +940,7 @@ class Expect(Tail): def read_until_output_matches(self, patterns, filter=lambda x: x, - timeout=30.0, internal_timeout=None, + timeout=60, internal_timeout=None, print_func=None): """ Read using read_nonblocking until a match is found using match_patterns, @@ -997,7 +997,7 @@ class Expect(Tail): raise ExpectError(patterns, o) - def read_until_last_word_matches(self, patterns, timeout=30.0, + def read_until_last_word_matches(self, patterns, timeout=60, internal_timeout=None, print_func=None): """ Read using read_nonblocking until the last word of the output matches @@ -1026,7 +1026,7 @@ class Expect(Tail): print_func) - def read_until_last_line_matches(self, patterns, timeout=30.0, + def read_until_last_line_matches(self, patterns, timeout=60, internal_timeout=None, print_func=None): """ Read using read_nonblocking until the last non-empty line of the output @@ -1166,7 +1166,7 @@ class ShellSession(Expect): return False - def read_up_to_prompt(self, timeout=30.0, internal_timeout=None, + def read_up_to_prompt(self, timeout=60, internal_timeout=None, print_func=None): """ Read using read_nonblocking until the last non-empty line of the output @@ -1193,7 +1193,7 @@ class ShellSession(Expect): return o - def cmd_output(self, cmd, timeout=30.0, internal_timeout=None, + def cmd_output(self, cmd, timeout=60, internal_timeout=None, print_func=None): """ Send a command and return its output. @@ -1237,7 +1237,7 @@ class ShellSession(Expect): return remove_last_nonempty_line(remove_command_echo(o, cmd)) - def cmd_status_output(self, cmd, timeout=30.0, internal_timeout=None, + def cmd_status_output(self, cmd, timeout=60, internal_timeout=None, print_func=None): """ Send a command and return its exit status and output. @@ -1272,7 +1272,7 @@ class ShellSession(Expect): raise ShellStatusError(cmd, o) - def cmd_status(self, cmd, timeout=30.0, internal_timeout=None, + def cmd_status(self, cmd, timeout=60, internal_timeout=None, print_func=None): """ Send a command and return its exit status. @@ -1296,7 +1296,7 @@ class ShellSession(Expect): return s - def cmd(self, cmd, timeout=30.0, internal_timeout=None, print_func=None): + def cmd(self, cmd, timeout=60, internal_timeout=None, print_func=None): """ Send a command and return its output. If the command's exit status is nonzero, raise an exception. @@ -1325,7 +1325,7 @@ class ShellSession(Expect): return o - def get_command_output(self, cmd, timeout=30.0, internal_timeout=None, + def get_command_output(self, cmd, timeout=60, internal_timeout=None, print_func=None): """ Alias for cmd_output() for backward compatibility. @@ -1333,8 +1333,8 @@ class ShellSession(Expect): return self.cmd_output(cmd, timeout, internal_timeout, print_func) - def get_command_status_output(self, cmd, timeout=30.0, - internal_timeout=None, print_func=None): + def get_command_status_output(self, cmd, timeout=60, internal_timeout=None, + print_func=None): """ Alias for cmd_status_output() for backward compatibility. """ @@ -1342,7 +1342,7 @@ class ShellSession(Expect): print_func) - def get_command_status(self, cmd, timeout=30.0, internal_timeout=None, + def get_command_status(self, cmd, timeout=60, internal_timeout=None, print_func=None): """ Alias for cmd_status() for backward compatibility.