From patchwork Mon Jan 3 18:34:05 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Goldish X-Patchwork-Id: 448881 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 p03IXdjc027529 for ; Mon, 3 Jan 2011 18:33:39 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754581Ab1ACSdg (ORCPT ); Mon, 3 Jan 2011 13:33:36 -0500 Received: from mx1.redhat.com ([209.132.183.28]:53446 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754385Ab1ACSdf (ORCPT ); Mon, 3 Jan 2011 13:33:35 -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 p03IXZS8011501 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 3 Jan 2011 13:33:35 -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 p03IXYYp007465; Mon, 3 Jan 2011 13:33:34 -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 p03IXWvt027804; Mon, 3 Jan 2011 13:33:33 -0500 From: Michael Goldish To: autotest@test.kernel.org, kvm@vger.kernel.org Cc: Michael Goldish Subject: [KVM-AUTOTEST PATCH 1/7] [RFC] Fix Unhandled* exceptions Date: Mon, 3 Jan 2011 20:34:05 +0200 Message-Id: <1294079651-21631-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, 03 Jan 2011 18:33:39 +0000 (UTC) diff --git a/client/bin/job.py b/client/bin/job.py index 3d552ce..f4306fc 100644 --- a/client/bin/job.py +++ b/client/bin/job.py @@ -1182,13 +1182,13 @@ def runjob(control, drop_caches, options): sys.exit(1) except error.JobError, instance: - logging.error("JOB ERROR: " + instance.args[0]) + logging.error("JOB ERROR: " + str(instance)) if myjob: command = None if len(instance.args) > 1: command = instance.args[1] - myjob.record('ABORT', None, command, instance.args[0]) - myjob.record('END ABORT', None, None, instance.args[0]) + myjob.record('ABORT', None, command, str(instance)) + myjob.record('END ABORT', None, None, str(instance)) assert myjob._record_indent == 0 myjob.complete(1) else: diff --git a/client/common_lib/error.py b/client/common_lib/error.py index 42dfe2b..71ba4e5 100644 --- a/client/common_lib/error.py +++ b/client/common_lib/error.py @@ -44,14 +44,19 @@ class JobError(AutotestError): class UnhandledJobError(JobError): """Indicates an unhandled error in a job.""" def __init__(self, unhandled_exception): - if isinstance(unhandled_exception, JobError): - JobError.__init__(self, *unhandled_exception.args) + JobError.__init__(self, unhandled_exception) + self.unhandled_exception = unhandled_exception + self.traceback = traceback.format_exc() + + def __str__(self): + if isinstance(self.unhandled_exception, JobError): + return JobError.__str__(self.unhandled_exception) else: msg = "Unhandled %s: %s" - msg %= (unhandled_exception.__class__.__name__, - unhandled_exception) - msg += "\n" + traceback.format_exc() - JobError.__init__(self, msg) + msg %= (self.unhandled_exception.__class__.__name__, + self.unhandled_exception) + msg += "\n" + self.traceback + return msg class TestBaseException(AutotestError): @@ -85,27 +90,37 @@ class TestWarn(TestBaseException): class UnhandledTestError(TestError): """Indicates an unhandled error in a test.""" def __init__(self, unhandled_exception): - if isinstance(unhandled_exception, TestError): - TestError.__init__(self, *unhandled_exception.args) + TestError.__init__(self, unhandled_exception) + self.unhandled_exception = unhandled_exception + self.traceback = traceback.format_exc() + + def __str__(self): + if isinstance(self.unhandled_exception, TestError): + return TestError.__str__(self.unhandled_exception) else: msg = "Unhandled %s: %s" - msg %= (unhandled_exception.__class__.__name__, - unhandled_exception) - msg += "\n" + traceback.format_exc() - TestError.__init__(self, msg) + msg %= (self.unhandled_exception.__class__.__name__, + self.unhandled_exception) + msg += "\n" + self.traceback + return msg class UnhandledTestFail(TestFail): """Indicates an unhandled fail in a test.""" def __init__(self, unhandled_exception): - if isinstance(unhandled_exception, TestFail): - TestFail.__init__(self, *unhandled_exception.args) + TestFail.__init__(self, unhandled_exception) + self.unhandled_exception = unhandled_exception + self.traceback = traceback.format_exc() + + def __str__(self): + if isinstance(self.unhandled_exception, TestFail): + return TestFail.__str__(self.unhandled_exception) else: msg = "Unhandled %s: %s" - msg %= (unhandled_exception.__class__.__name__, - unhandled_exception) - msg += "\n" + traceback.format_exc() - TestFail.__init__(self, msg) + msg %= (self.unhandled_exception.__class__.__name__, + self.unhandled_exception) + msg += "\n" + self.traceback + return msg class CmdError(TestError):