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

minor test suite fixes

Browse source
This commit is contained in:
The MMGen Project 2021-09-29 21:17:55 +00:00
commit fe756f7303
Signed by: mmgen
GPG key ID: 3F8B1861E32B7DA2
4 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mmgen/tool.py
View file

@ -208,7 +208,7 @@ def _process_result(ret,pager=False,print_result=False):
if ret == True:
return True
elif ret in (False,None):
ydie(1,"tool command returned '{}'".format(ret))
ydie(1,f'tool command returned {ret!r}')
elif isinstance(ret,str):
return triage_result(ret)
elif isinstance(ret,int):

6
test/test-release.sh
View file

@ -10,8 +10,10 @@ elif uname -a | grep -q 'MSYS'; then
SUDO='' MSYS2=1;
fi
RED="\e[31;1m" GREEN="\e[32;1m" YELLOW="\e[33;1m" BLUE="\e[34;1m" MAGENTA="\e[35;1m" CYAN="\e[36;1m"
RESET="\e[0m"
[ "$MMGEN_DISABLE_COLOR" ] || {
RED="\e[31;1m" GREEN="\e[32;1m" YELLOW="\e[33;1m" BLUE="\e[34;1m" MAGENTA="\e[35;1m" CYAN="\e[36;1m"
RESET="\e[0m"
}
trap 'echo -e "${GREEN}Exiting at user request$RESET"; exit' INT

8
test/test_py_d/input.py
View file

@ -49,7 +49,13 @@ def stealth_mnemonic_entry(t,mne,mn,entry_mode,pad_entry=False):
if entry_mode == 'fixed':
mn = ['bkr'] + mn[:5] + ['nfb'] + mn[5:]
ssl = mne.uniq_ss_len
mn = [w[:ssl] if len(w) >= ssl else (w[0] + 'z\b{}'.format('#'*(ssl-len(w))) + w[1:]) for w in mn]
def gen_mn():
for w in mn:
if len(w) >= ssl:
yield w[:ssl]
else:
yield w[0] + 'z\b' + '#' * (ssl-len(w)) + w[1:]
mn = list(gen_mn())
elif entry_mode in ('full','short'):
mn = ['fzr'] + mn[:5] + ['grd','grdbxm'] + mn[5:]
mn = pad_mnemonic(mn,mne.em.ss_len)

2
test/tooltest2.py
View file

@ -824,7 +824,7 @@ async def run_test(gid,cmd_name):
vmsg(cp.stderr.strip().decode())
if cp.returncode != 0:
import re
m = re.match(b"tool command returned '(None|False)'"+NL.encode(),cp.stderr)
m = re.match(b'tool command returned (None|False)'+NL.encode(),cp.stderr)
if m:
return { b'None': None, b'False': False }[m.group(1)]
else: