diff --git a/doc/release-notes.md b/doc/release-notes.md index 3a39efadbc..d09772ff33 100644 --- a/doc/release-notes.md +++ b/doc/release-notes.md @@ -68,6 +68,7 @@ Notable changes - #32841 feature_taproot: sample tx version border values more - #32850 test: check P2SH sigop count for coinbase tx - #32859 test: correctly detect nonstd TRUC tx vsize in feature_taproot +- #33001 test: Do not pass tests on unhandled exceptions ### Util diff --git a/test/functional/test_framework/test_framework.py b/test/functional/test_framework/test_framework.py index 2902c68340..dcbe4bed1a 100755 --- a/test/functional/test_framework/test_framework.py +++ b/test/functional/test_framework/test_framework.py @@ -134,26 +134,14 @@ class BitcoinTestFramework(metaclass=BitcoinTestMetaClass): else: self.run_test() - except JSONRPCException: - self.log.exception("JSONRPC error") - self.success = TestStatus.FAILED except SkipTest as e: self.log.warning("Test Skipped: %s" % e.message) self.success = TestStatus.SKIPPED - except AssertionError: - self.log.exception("Assertion failed") - self.success = TestStatus.FAILED - except KeyError: - self.log.exception("Key error") - self.success = TestStatus.FAILED except subprocess.CalledProcessError as e: - self.log.exception("Called Process failed with '{}'".format(e.output)) + self.log.exception(f"Called Process failed with stdout='{e.stdout}'; stderr='{e.stderr}';") self.success = TestStatus.FAILED - except Exception: - self.log.exception("Unexpected exception caught during testing") - self.success = TestStatus.FAILED - except KeyboardInterrupt: - self.log.warning("Exiting after keyboard interrupt") + except BaseException: + self.log.exception("Unexpected exception") self.success = TestStatus.FAILED finally: exit_code = self.shutdown()