From 46dcb5cabeca19bdfaa1634419d7d7dd1b6026c0 Mon Sep 17 00:00:00 2001
From: The MMGen Project <mmgen@tuta.io>
Date: Fri, 19 May 2023 16:16:52 +0000
Subject: [PATCH] minor fixes and cleanups

---
 mmgen/term.py                  | 1 +
 test/misc/get_passphrase.py    | 3 ++-
 test/misc/term.py              | 2 +-
 test/test.py                   | 6 ++++--
 test/test_py_d/ts_xmrwallet.py | 4 ++--
 test/unit_tests_d/ut_dep.py    | 2 +-
 test/unit_tests_d/ut_misc.py   | 3 ++-
 test/unit_tests_d/ut_rpc.py    | 2 +-
 8 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/mmgen/term.py b/mmgen/term.py
index 0c286d91..53836824 100755
--- a/mmgen/term.py
+++ b/mmgen/term.py
@@ -212,6 +212,7 @@ class MMGenTermMSWin(MMGenTerm):
 		if x and y:
 			return _term_dimensions(x,y)
 		else:
+			from .color import yellow
 			msg(yellow('Warning: could not get terminal size. Using fallback dimensions.'))
 			return _term_dimensions(80,25)
 
diff --git a/test/misc/get_passphrase.py b/test/misc/get_passphrase.py
index b5ac7187..d01adda6 100755
--- a/test/misc/get_passphrase.py
+++ b/test/misc/get_passphrase.py
@@ -10,8 +10,9 @@ from mmgen.common import *
 opts_data = {
 	'text': {
 		'desc':    '',
-		'usage':   '',
+		'usage':   f'crypto | seed',
 		'options': """
+-h, --help            Print this help message
 -P, --passwd-file=f   a
 -p, --hash-preset=p   b
 -r, --usr-randchars=n c
diff --git a/test/misc/term.py b/test/misc/term.py
index b26a6188..3b80c269 100755
--- a/test/misc/term.py
+++ b/test/misc/term.py
@@ -159,7 +159,7 @@ def tt_txview():
 	cmsg('Testing tx.info.view_with_prompt() (try each viewing option)')
 	from mmgen.tx import UnsignedTX
 	fn = 'test/ref/0B8D5A[15.31789,14,tl=1320969600].rawtx'
-	tx = UnsignedTX(filename=fn,quiet_open=True)
+	tx = UnsignedTX(cfg=cfg,filename=fn,quiet_open=True)
 	while True:
 		tx.info.view_with_prompt('View data for transaction?',pause=False)
 		set_vt100()
diff --git a/test/test.py b/test/test.py
index 5ee48a28..1b6338d8 100755
--- a/test/test.py
+++ b/test/test.py
@@ -213,6 +213,7 @@ proto = cfg._proto
 
 # step 3: move data_dir to /dev/shm and symlink it back to ./test:
 trash_dir = os.path.join('test','trash')
+trash_dir2 = os.path.join('test','trash2')
 
 if not cfg.skipping_deps:
 	shm_dir = create_shm_dir(data_dir,trash_dir)
@@ -315,7 +316,8 @@ def clean(usr_dirs=None,clean_overlay=True):
 		))
 	cleandir(data_dir)
 	cleandir(trash_dir)
-	iqmsg(green(f'Cleaned directories {data_dir!r} {trash_dir!r}'))
+	cleandir(trash_dir2)
+	iqmsg(green(f'Cleaned directories {data_dir!r} {trash_dir!r} {trash_dir2!r}'))
 
 	if clean_overlay:
 		cleandir(overlay_tree_dir)
@@ -326,7 +328,7 @@ def create_tmp_dirs(shm_dir):
 		for cfg in sorted(cfgs):
 			mk_tmpdir(cfgs[cfg]['tmpdir'])
 	else:
-		os.makedirs( 'test/tmp', mode=0o755, exist_ok=True )
+		os.makedirs( os.path.join('test','tmp'), mode=0o755, exist_ok=True )
 		for cfg in sorted(cfgs):
 			src = os.path.join(shm_dir,cfgs[cfg]['tmpdir'].split('/')[-1])
 			mk_tmpdir(src)
diff --git a/test/test_py_d/ts_xmrwallet.py b/test/test_py_d/ts_xmrwallet.py
index 3b26ca32..015f0ae3 100755
--- a/test/test_py_d/ts_xmrwallet.py
+++ b/test/test_py_d/ts_xmrwallet.py
@@ -825,14 +825,14 @@ class TestSuiteXMRWallet(TestSuiteBase):
 				break
 			await asyncio.sleep(2)
 			h = await self._get_height()
-			if count > 12: # something has probably gone wrong
+			if count > 12: # something might have gone wrong, so be more verbose
 				imsg(f'Height: {h} ')
 				print_balance(dest,bal_info)
 			else:
 				imsg_r(f'{h} ')
 				oqmsg_r('+')
 		else:
-			die(2,'Timeout exceeded, balance {bal_info.ub!r}')
+			die(2,f'Timeout exceeded, balance {bal_info.ub!r}')
 
 		await self.stop_mining()
 
diff --git a/test/unit_tests_d/ut_dep.py b/test/unit_tests_d/ut_dep.py
index 0e420ec6..d889b8e9 100755
--- a/test/unit_tests_d/ut_dep.py
+++ b/test/unit_tests_d/ut_dep.py
@@ -16,7 +16,7 @@ from ..include.common import cfg,vmsg,check_solc_ver
 class unit_tests:
 
 	altcoin_deps = ('pysha3','py_ecc','solc')
-	win_skip = ('aiohttp','pysha3','led')
+	win_skip = ('pysha3','led')
 
 	def led(self,name,ut):
 		from mmgen.led import LEDControl
diff --git a/test/unit_tests_d/ut_misc.py b/test/unit_tests_d/ut_misc.py
index ea499c1b..745a664d 100755
--- a/test/unit_tests_d/ut_misc.py
+++ b/test/unit_tests_d/ut_misc.py
@@ -33,7 +33,7 @@ class unit_tests:
 		assert ver['current'] < '7.0'
 		assert ver['3.3']     < '4.3'
 		assert ver['3.12']    < '7.0'
-		assert ver['3.3']     < '3.12'
+		assert ver['3.3']     < '3.12' # ensure we’re comparing numerically, not stringwise
 
 		assert ver['current'] <= ver['current']
 		assert ver['3.3']     <= '4.3'
@@ -60,6 +60,7 @@ class unit_tests:
 		assert ver['3.12']    >= '3.3'
 
 		assert '3.0' < ver['3.12'] < '3.13'
+		assert '3.9' < ver['3.12'] # ensure we’re reverse comparing numerically, not stringwise
 		assert '3.3' < ver['4.3']  <= '4.3'
 		assert '4.3' <= ver['4.3'] <= '4.3'
 		assert '4.3' == ver['4.3'] == '4.3'
diff --git a/test/unit_tests_d/ut_rpc.py b/test/unit_tests_d/ut_rpc.py
index d56f7503..1edbf701 100755
--- a/test/unit_tests_d/ut_rpc.py
+++ b/test/unit_tests_d/ut_rpc.py
@@ -226,6 +226,6 @@ class unit_tests:
 		from mmgen.xmrseed import xmrseed
 		import shutil
 		shutil.rmtree('test/trash2',ignore_errors=True)
-		os.makedirs('test/trash2')
+		os.makedirs('test/trash2/wallet_rpc')
 		async_run(run())
 		return True