From 188df57e816a4f35d6868426c256f19ea49d270e Mon Sep 17 00:00:00 2001 From: The MMGen Project Date: Thu, 24 Jun 2021 17:15:23 +0000 Subject: [PATCH] test.py: add 'no_traceback' opt to spawn() --- test/test.py | 5 +++-- test/test_py_d/ts_regtest.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/test/test.py b/test/test.py index a93685af..db98b725 100755 --- a/test/test.py +++ b/test/test.py @@ -649,7 +649,8 @@ class TestSuiteRunner(object): no_output = False, msg_only = False, no_msg = False, - cmd_dir = 'cmds' ): + cmd_dir = 'cmds', + no_traceback = False ): desc = self.ts.test_name if opt.names else self.gm.dpy_data[self.ts.test_name][1] if extra_desc: desc += ' ' + extra_desc @@ -665,7 +666,7 @@ class TestSuiteRunner(object): args = [cmd] + passthru_opts + self.ts.extra_spawn_args + args - if opt.traceback: + if opt.traceback and not no_traceback: args = ['scripts/traceback_run.py'] + args if g.platform == 'win': diff --git a/test/test_py_d/ts_regtest.py b/test/test_py_d/ts_regtest.py index 89c8d403..c40a8557 100755 --- a/test/test_py_d/ts_regtest.py +++ b/test/test_py_d/ts_regtest.py @@ -314,7 +314,7 @@ class TestSuiteRegtest(TestSuiteBase,TestSuiteShared): icls = MMGenWallet fn = get_file_with_ext(self._user_dir(user),icls.ext) - t = self.spawn('mmgen-tool',['get_subseed',subseed_idx,'wallet='+fn],no_msg=True) + t = self.spawn('mmgen-tool',['get_subseed',subseed_idx,'wallet='+fn],no_msg=True,no_traceback=True) t.passphrase(icls.desc,rt_pw) sid = t.read().strip()[:8] self.usr_subsids[user][subseed_idx] = sid