mmgen/mmgen-wallet
1
Fork 0
Code Releases 28 Wiki Activity

test.py: pass through only explicitly set opts

Browse source
This commit is contained in:
The MMGen Project 2022-10-17 18:37:23 +00:00
commit 4c9f6e7071
Signed by: mmgen
GPG key ID: 3F8B1861E32B7DA2
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
mmgen/opts.py
View file

@ -286,7 +286,8 @@ def init(
parse_only = False,
parsed_opts = None,
need_proto = True,
do_post_init = False ):
do_post_init = False,
return_parsed = False ):
if opts_data is None:
opts_data = opts_data_dfl
@ -446,7 +447,7 @@ def init(
else:
delete_data(opts_data)
return po.cmd_args
return po if return_parsed else po.cmd_args
def check_usr_opts(usr_opts): # Raises an exception if any check fails

6
test/test.py
View file

@ -183,7 +183,8 @@ opts.UserOpts._reset_ok += (
'skipping_deps' )
# step 2: opts.init will create new data_dir in ./test (if not opt.skipping_deps)
usr_args = opts.init(opts_data)
parsed_opts = opts.init(opts_data,return_parsed=True)
usr_args = parsed_opts.cmd_args
if opt.daemon_id and opt.daemon_id in g.blacklist_daemons.split():
die(0,f'test.py: daemon {opt.daemon_id!r} blacklisted, exiting')
@ -673,10 +674,11 @@ class TestSuiteRunner(object):
self.ts = self.gm.gm_init_group(self,gname,sg_name,self.spawn_wrapper)
self.ts_clsname = type(self.ts).__name__
# only pass through opts that are explicitly set on cmdline (po.user_opts)
self.passthru_opts = ['--{}{}'.format(
k.replace('_','-'),
'=' + getattr(opt,k) if getattr(opt,k) != True else ''
) for k in self.ts.base_passthru_opts + self.ts.passthru_opts if getattr(opt,k)]
) for k in self.ts.base_passthru_opts + self.ts.passthru_opts if k in parsed_opts.user_opts]
if opt.resuming:
rc = opt.resume or opt.resume_after