From 930ed631a0fe72c117196c2440735cc056064fe3 Mon Sep 17 00:00:00 2001 From: The MMGen Project Date: Sat, 9 Mar 2024 11:33:26 +0000 Subject: [PATCH] cmdtest.py: fix handling of TestSuiteSpawnedScriptException --- test/cmdtest.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/test/cmdtest.py b/test/cmdtest.py index 71f4e7c6..0116adb9 100755 --- a/test/cmdtest.py +++ b/test/cmdtest.py @@ -1062,15 +1062,12 @@ if __name__ == '__main__': stop_test_daemons(network_id) tr.warn_skipped() die(1,'\ntest.py exiting at user request') - except TestSuiteException as e: - die(2,e.args[0]) - except TestSuiteFatalException as e: - die(4,e.args[0]) except TestSuiteSpawnedScriptException as e: # if spawned script is not running under exec_wrapper, output brief error msg: if os.getenv('MMGEN_EXEC_WRAPPER'): Msg(red(str(e))) Msg(blue('cmdtest.py: spawned script exited with error')) + raise except Exception: # if cmdtest.py itself is running under exec_wrapper, re-raise so exec_wrapper can handle exception: if os.getenv('MMGEN_EXEC_WRAPPER') or not os.getenv('MMGEN_IGNORE_TEST_PY_EXCEPTION'):