From patchwork Fri Apr 8 20:33:08 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas Meneghel Rodrigues X-Patchwork-Id: 695541 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 p38KXM6b022800 for ; Fri, 8 Apr 2011 20:33:22 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757898Ab1DHUdS (ORCPT ); Fri, 8 Apr 2011 16:33:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35147 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757843Ab1DHUdQ (ORCPT ); Fri, 8 Apr 2011 16:33:16 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p38KXF51010106 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 8 Apr 2011 16:33:15 -0400 Received: from freedom.redhat.com (vpn-11-221.rdu.redhat.com [10.11.11.221]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p38KXA9n003136; Fri, 8 Apr 2011 16:33:14 -0400 From: Lucas Meneghel Rodrigues To: autotest@test.kernel.org Cc: kvm@vger.kernel.org, Lucas Meneghel Rodrigues Subject: [PATCH 3/3] KVM test: enospc subtest: Catch error.TestWarn in main loop Date: Fri, 8 Apr 2011 17:33:08 -0300 Message-Id: <1302294788-10078-3-git-send-email-lmr@redhat.com> In-Reply-To: <1302294788-10078-1-git-send-email-lmr@redhat.com> References: <1302294788-10078-1-git-send-email-lmr@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 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.6 (demeter1.kernel.org [140.211.167.41]); Fri, 08 Apr 2011 20:33:23 +0000 (UTC) Now that image_check() can throw TestWarn exceptions, let's catch it as well. Signed-off-by: Lucas Meneghel Rodrigues --- client/tests/kvm/tests/enospc.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/client/tests/kvm/tests/enospc.py b/client/tests/kvm/tests/enospc.py index 3c53b64..9917144 100644 --- a/client/tests/kvm/tests/enospc.py +++ b/client/tests/kvm/tests/enospc.py @@ -54,7 +54,7 @@ def run_enospc(test, params, env): image_params = vm.params.object_params(image_name) try: kvm_vm.check_image(image_params, test.bindir) - except kvm_vm.VMError, e: + except (kvm_vm.VMError, error.TestWarn), e: logging.error(e) logging.info("Guest paused, extending Logical Volume size") try: