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 <jsnow@redhat.com>
Reported-by: Thomas Huth <thuth@redhat.com>
Tested-by: Thomas Huth <thuth@redhat.com>
Message-id: 20211111143719.2162525-4-jsnow@redhat.com
Signed-off-by: John Snow <jsnow@redhat.com>
staging
John Snow 2021-11-11 09:37:17 -05:00
parent 25de7f5012
commit 47b43acd57
1 changed files with 2 additions and 6 deletions

View File

@ -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: