From patchwork Fri Jun 18 00:14:24 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Goldish X-Patchwork-Id: 106774 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o5I0F2me015806 for ; Fri, 18 Jun 2010 00:15:11 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760904Ab0FRAPG (ORCPT ); Thu, 17 Jun 2010 20:15:06 -0400 Received: from mx1.redhat.com ([209.132.183.28]:21179 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760753Ab0FRAO7 (ORCPT ); Thu, 17 Jun 2010 20:14:59 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o5I0Ewu5001375 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 17 Jun 2010 20:14:58 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o5I0Evdv005529; Thu, 17 Jun 2010 20:14:57 -0400 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 o5I0EljN005733; Thu, 17 Jun 2010 20:14:56 -0400 From: Michael Goldish To: autotest@test.kernel.org, kvm@vger.kernel.org Cc: Michael Goldish Subject: [KVM-AUTOTEST PATCH 07/18] KVM test: kvm_preprocessing.py: simplify pre/post_command error handling Date: Fri, 18 Jun 2010 03:14:24 +0300 Message-Id: <1276820075-31310-7-git-send-email-mgoldish@redhat.com> In-Reply-To: <1276820075-31310-6-git-send-email-mgoldish@redhat.com> References: <1276820075-31310-1-git-send-email-mgoldish@redhat.com> <1276820075-31310-2-git-send-email-mgoldish@redhat.com> <1276820075-31310-3-git-send-email-mgoldish@redhat.com> <1276820075-31310-4-git-send-email-mgoldish@redhat.com> <1276820075-31310-5-git-send-email-mgoldish@redhat.com> <1276820075-31310-6-git-send-email-mgoldish@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 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 (demeter.kernel.org [140.211.167.41]); Fri, 18 Jun 2010 00:15:11 +0000 (UTC) diff --git a/client/tests/kvm/kvm_preprocessing.py b/client/tests/kvm/kvm_preprocessing.py index 84ad7c5..1ed4ec2 100644 --- a/client/tests/kvm/kvm_preprocessing.py +++ b/client/tests/kvm/kvm_preprocessing.py @@ -162,12 +162,10 @@ def process_command(test, params, env, command, command_timeout, try: utils.system("cd %s; %s" % (test.bindir, command)) except error.CmdError, e: - logging.warn("Custom processing command '%s' failed, output is: %s", - command, str(e)) - if not command_noncritical: - raise error.TestError("Custom processing command failed: %s" % - str(e)) - + if command_noncritical: + logging.warn(e) + else: + raise def process(test, params, env, image_func, vm_func): """