From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lucas Meneghel Rodrigues Subject: Re: [PATCH] Correcting timeout interruption of virtio_console test. Date: Mon, 06 Dec 2010 21:13:38 -0200 Message-ID: <1291677218.2585.14.camel@freedom> References: <1291381809-16450-1-git-send-email-jzupka@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: kvm-autotest@redhat.com, kvm@vger.kernel.org, autotest@test.kernel.org, ldoktor@redhat.com, akong@redhat.com To: =?UTF-8?Q?Ji=C5=99=C3=AD_=C5=BDupka?= Return-path: Received: from mx1.redhat.com ([209.132.183.28]:43089 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752658Ab0LFXNo (ORCPT ); Mon, 6 Dec 2010 18:13:44 -0500 In-Reply-To: <1291381809-16450-1-git-send-email-jzupka@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: On Fri, 2010-12-03 at 14:10 +0100, Ji=C5=99=C3=AD =C5=BDupka wrote: > Catch new exception from kvm_suprocess to avoid killing of tests. Hi guys, I did some rebasing in all your patches to virtio_console and re-sent to the mailing list. All of them are applied, thank you very much for your work on this! Lucas > --- > client/tests/kvm/tests/virtio_console.py | 10 +++++++--- > 1 files changed, 7 insertions(+), 3 deletions(-) >=20 > diff --git a/client/tests/kvm/tests/virtio_console.py b/client/tests/= kvm/tests/virtio_console.py > index d8d2143..d083783 100644 > --- a/client/tests/kvm/tests/virtio_console.py > +++ b/client/tests/kvm/tests/virtio_console.py > @@ -468,9 +468,13 @@ def run_virtio_console(test, params, env): > logging.debug("Executing '%s' on virtio_guest.py loop, vm: %= s," + > "timeout: %s", command, vm[0].name, timeout) > vm[1].sendline(command) > - (match, data) =3D vm[1].read_until_last_line_matches(["PASS:= ", > - "FAIL:[Failed to= execute]"], > - timeout) > + try: > + (match, data) =3D vm[1].read_until_last_line_matches(["P= ASS:", > + "FAI= L:"], > + timeo= ut) > + except (kvm_subprocess.ExpectTimeoutError): > + match =3D None > + data =3D None > return (match, data) > =20 >=20