Browse Source

test.py: add 'no_traceback' opt to spawn()

The MMGen Project 3 years ago
parent
commit
188df57e81
2 changed files with 4 additions and 3 deletions
  1. 3 2
      test/test.py
  2. 1 1
      test/test_py_d/ts_regtest.py

+ 3 - 2
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':

+ 1 - 1
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