From fe756f7303d50c6cbd1adaad4dbbe406d54d716c Mon Sep 17 00:00:00 2001
From: The MMGen Project <mmgen@tuta.io>
Date: Wed, 29 Sep 2021 21:17:55 +0000
Subject: [PATCH] minor test suite fixes

---
 mmgen/tool.py           | 2 +-
 test/test-release.sh    | 6 ++++--
 test/test_py_d/input.py | 8 +++++++-
 test/tooltest2.py       | 2 +-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/mmgen/tool.py b/mmgen/tool.py
index fd73f43e..baa14171 100755
--- a/mmgen/tool.py
+++ b/mmgen/tool.py
@@ -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):
diff --git a/test/test-release.sh b/test/test-release.sh
index db13a668..60efc7c5 100755
--- a/test/test-release.sh
+++ b/test/test-release.sh
@@ -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
 
diff --git a/test/test_py_d/input.py b/test/test_py_d/input.py
index 1fd8fc7d..d66c0ea7 100755
--- a/test/test_py_d/input.py
+++ b/test/test_py_d/input.py
@@ -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)
diff --git a/test/tooltest2.py b/test/tooltest2.py
index 0d85138d..14ae7266 100755
--- a/test/tooltest2.py
+++ b/test/tooltest2.py
@@ -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: