From nobody Mon Feb 9 12:09:45 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1636641671915706.336826195641; Thu, 11 Nov 2021 06:41:11 -0800 (PST) Received: from localhost ([::1]:53794 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mlBGI-0005CS-Ol for importer@patchew.org; Thu, 11 Nov 2021 09:41:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45544) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mlBCk-0008Qx-Rv for qemu-devel@nongnu.org; Thu, 11 Nov 2021 09:37:30 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:31387) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mlBCj-0001hC-A5 for qemu-devel@nongnu.org; Thu, 11 Nov 2021 09:37:30 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-346-s7wmtOcTMpKQv_cd-O4ujw-1; Thu, 11 Nov 2021 09:37:27 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4AA631572B for ; Thu, 11 Nov 2021 14:37:26 +0000 (UTC) Received: from scv.redhat.com (unknown [10.22.33.175]) by smtp.corp.redhat.com (Postfix) with ESMTP id B0BB360C17; Thu, 11 Nov 2021 14:37:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1636641448; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zWkGae6rIVOJoLjAY49KbgiBpJkjKg0h3oKuq815D2c=; b=Aw7HDBaABT7sRfFgezuY9ygYQqav8T/LDB/nR9fN4R9JEhF+BRXclTGMtcxaptAZUd8UjA rLQo9+8N6JTlhelM1vqe4pO/9dPXRLT1EaLzlKtZ5iVNid7JaH/QUqPacNbTRzlsshh3wZ ID6cy+Qhk38Eg2Rxd3ww/rod32zbEEg= X-MC-Unique: s7wmtOcTMpKQv_cd-O4ujw-1 From: John Snow To: qemu-devel@nongnu.org Subject: [PATCH 3/5] scripts/device-crash-test: simplify Exception handling Date: Thu, 11 Nov 2021 09:37:17 -0500 Message-Id: <20211111143719.2162525-4-jsnow@redhat.com> In-Reply-To: <20211111143719.2162525-1-jsnow@redhat.com> References: <20211111143719.2162525-1-jsnow@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jsnow@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.7, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , John Snow , Eduardo Habkost , Cleber Rosa Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1636641673206100001 Content-Type: text/plain; charset="utf-8" We don't need to handle KeyboardInterruptError specifically; we can instead tighten the scope of the broad Exception handlers to only catch "Exception", which has the effect of allowing all BaseException classes that do not inherit from Exception to be raised through. KeyboardInterruptError and a few other important ones are BaseExceptions, so this does the same thing with less code. Signed-off-by: John Snow --- scripts/device-crash-test | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/scripts/device-crash-test b/scripts/device-crash-test index 8331c057b8..d91e8616ef 100755 --- a/scripts/device-crash-test +++ b/scripts/device-crash-test @@ -317,9 +317,7 @@ class QemuBinaryInfo(object): try: vm.launch() mi['runnable'] =3D True - except KeyboardInterrupt: - raise - except: + except Exception: dbg("exception trying to run binary=3D%s machine=3D%s", self.b= inary, machine, exc_info=3Dsys.exc_info()) dbg("log: %r", vm.get_log()) mi['runnable'] =3D False @@ -360,9 +358,7 @@ def checkOneCase(args, testcase): exc_traceback =3D None try: vm.launch() - except KeyboardInterrupt: - raise - except: + except Exception: exc_traceback =3D traceback.format_exc() dbg("Exception while running test case") finally: --=20 2.31.1