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

test.py, test.py xmrwallet: minor changes

Browse source
This commit is contained in:
The MMGen Project 2021-07-03 12:53:45 +00:00
commit 82c817dd4c
Signed by: mmgen
GPG key ID: 3F8B1861E32B7DA2
2 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
test/test_py_d/common.py
View file

@ -96,7 +96,7 @@ def restore_debug():
for k in save_debug:
os.environ[k] = save_debug[k] or ''
def get_file_with_ext(tdir,ext,delete=True,no_dot=False,return_list=False,delete_all=False,quiet=False):
def get_file_with_ext(tdir,ext,delete=True,no_dot=False,return_list=False,delete_all=False):
dot = ('.','')[bool(no_dot)]
flist = [os.path.join(tdir,f) for f in os.listdir(tdir) if f == ext or f[-len(dot+ext):] == dot+ext]
@ -106,7 +106,7 @@ def get_file_with_ext(tdir,ext,delete=True,no_dot=False,return_list=False,delete
if len(flist) > 1 or delete_all:
if delete or delete_all:
if not (quiet or opt.quiet):
if (opt.exact_output or opt.verbose) and not opt.quiet:
msg("Multiple *.{} files in '{}' - deleting".format(ext,tdir))
for f in flist:
os.unlink(f)

11
test/test_py_d/ts_xmrwallet.py
View file

@ -53,9 +53,9 @@ class TestSuiteXMRWallet(TestSuiteBase):
('sweep_to_address_proxy', 'sweeping to new address (via TX relay + proxy)'),
('sweep_to_account', 'sweeping to new account'),
('sweep_to_address_noproxy', 'sweeping to new address (via TX relay)'),
('sweep_to_address_noproxy', 'sweeping to new address (via TX relay, no proxy)'),
('transfer_to_miner_proxy', 'transferring funds to Miner (via TX relay + proxy)'),
('transfer_to_miner_noproxy', 'transferring funds to Miner (via TX relay)'),
('transfer_to_miner_noproxy', 'transferring funds to Miner (via TX relay, no proxy)'),
)
def __init__(self,trunner,cfgs,spawn):
@ -522,6 +522,7 @@ class TestSuiteXMRWallet(TestSuiteBase):
await self.open_wallet_user(dest.user,dest.wnum)
ub_start = await get_balance(dest,0)
chk_bal_chg = dest.test(ub_start) == 'chk_bal_chg'
if random_txs:
await send_random_txs()
@ -533,9 +534,7 @@ class TestSuiteXMRWallet(TestSuiteBase):
for count in range(500):
ub = await get_balance(dest,count)
ret = dest.test(ub)
return_bal = isinstance(ret,XMRAmt)
if ret is True or ( return_bal and ret > ub_start ):
if dest.test(ub) is True or ( chk_bal_chg and ub != ub_start ):
imsg('')
oqmsg_r('+')
print_balance(dest,ub)
@ -551,7 +550,7 @@ class TestSuiteXMRWallet(TestSuiteBase):
await self.close_wallet_user(dest.user)
return ub if return_bal else 'ok'
return ub if chk_bal_chg else 'ok'
# util methods