From: John Snow Date: Thu, 11 Nov 2021 14:37:17 +0000 (-0500) Subject: scripts/device-crash-test: simplify Exception handling X-Git-Tag: nvme-fixes-for-6.2-pull-request~7^2~2 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=47b43acd57e6e0b2910683f00a758adbc418dde6;p=qemu-nvme.git scripts/device-crash-test: simplify Exception handling 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 Reported-by: Thomas Huth Tested-by: Thomas Huth Message-id: 20211111143719.2162525-4-jsnow@redhat.com Signed-off-by: John Snow --- 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'] = True - except KeyboardInterrupt: - raise - except: + except Exception: dbg("exception trying to run binary=%s machine=%s", self.binary, machine, exc_info=sys.exc_info()) dbg("log: %r", vm.get_log()) mi['runnable'] = False @@ -360,9 +358,7 @@ def checkOneCase(args, testcase): exc_traceback = None try: vm.launch() - except KeyboardInterrupt: - raise - except: + except Exception: exc_traceback = traceback.format_exc() dbg("Exception while running test case") finally: