From b3764f6a4e70e365a69f2d277d9cb5ed7524b8ae Mon Sep 17 00:00:00 2001 From: The MMGen Project Date: Thu, 17 Sep 2026 16:00:08 +0000 Subject: [PATCH] cfg var rename: `test_suite_root_pfx` -> `test_suite_autosign_root_dir` --- mmgen/autosign/__init__.py | 2 +- test/cmdtest_d/autosign.py | 4 ++-- test/overlay/fakemods/mmgen/autosign/__init__.py | 2 +- test/overlay/fakemods/mmgen/cfg.py | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/mmgen/autosign/__init__.py b/mmgen/autosign/__init__.py index 08010a12..fa1930c8 100755 --- a/mmgen/autosign/__init__.py +++ b/mmgen/autosign/__init__.py @@ -496,7 +496,7 @@ class Autosign: die(2, f'blkid exited with error code {cp.returncode}') return self.dev_label in cp.stdout.splitlines() case 'darwin': - if self.cfg.test_suite_root_pfx: + if self.cfg.test_suite_autosign_root_dir: return self.mountpoint.exists() else: return run( diff --git a/test/cmdtest_d/autosign.py b/test/cmdtest_d/autosign.py index 745866f2..cd41537d 100755 --- a/test/cmdtest_d/autosign.py +++ b/test/cmdtest_d/autosign.py @@ -94,7 +94,7 @@ class CmdTestAutosignBase(CmdTestBase): self.txhex_file = f'{self.tmpdir}/tx_dump.hex' if not self.live: - self.spawn_env['MMGEN_TEST_SUITE_ROOT_PFX'] = self.tmpdir + self.spawn_env['MMGEN_TEST_SUITE_AUTOSIGN_ROOT_DIR'] = self.tmpdir if self.threaded: self.spawn_env['MMGEN_TEST_SUITE_AUTOSIGN_THREADED'] = '1' @@ -123,7 +123,7 @@ class CmdTestAutosignBase(CmdTestBase): Config({ 'coins': ','.join(self.coins), 'test_suite_autosign_threaded': self.threaded, - 'test_suite_root_pfx': None if self.live else self.tmpdir, + 'test_suite_autosign_root_dir': None if self.live else self.tmpdir, 'online': subdir == 'online'})) if create_dirs and not self.live: diff --git a/test/overlay/fakemods/mmgen/autosign/__init__.py b/test/overlay/fakemods/mmgen/autosign/__init__.py index bf4355ad..1b2af94c 100644 --- a/test/overlay/fakemods/mmgen/autosign/__init__.py +++ b/test/overlay/fakemods/mmgen/autosign/__init__.py @@ -3,7 +3,7 @@ from .__init___orig import * class overlay_fake_Autosign: def init_fixup(self): - if pfx := self.cfg.test_suite_root_pfx: + if pfx := self.cfg.test_suite_autosign_root_dir: subdir = pfx + '/' + ('online' if self.cfg.online else 'offline') for k in ('mountpoint', 'shm_dir', 'wallet_dir'): orig_path = str(getattr(self, k)) diff --git a/test/overlay/fakemods/mmgen/cfg.py b/test/overlay/fakemods/mmgen/cfg.py index bd8a6cff..368a40c9 100644 --- a/test/overlay/fakemods/mmgen/cfg.py +++ b/test/overlay/fakemods/mmgen/cfg.py @@ -34,7 +34,7 @@ for k, v in { 'test_suite_popen_spawn': False, # line_input() - using getattr() with dfl val - OK 'test_suite_hold_protect_disable': False, # init_term() - using getattr() with dfl val - OK 'test_suite_autosign_threaded': False, # autosign - OK - 'test_suite_root_pfx': '', # autosign - OK + 'test_suite_autosign_root_dir': '', # autosign - OK 'test_suite_bogus_send': False, # tx.online - OK 'test_datadir': os.path.join('test', 'tmp', 'data_dir'), # cfg - OK @@ -57,6 +57,7 @@ for k, v in { Config._env_opts += ( # these are referenced in test suite only, except as noted: 'MMGEN_TEST_SUITE_AUTOSIGN_LED_SIMULATE', + 'MMGEN_TEST_SUITE_AUTOSIGN_ROOT_DIR', 'MMGEN_TEST_SUITE_AUTOSIGN_THREADED', 'MMGEN_TEST_SUITE_BOGUS_SEND', 'MMGEN_TEST_SUITE_BOGUS_UNSPENT_DATA', @@ -72,8 +73,7 @@ Config._env_opts += ( 'MMGEN_TEST_SUITE_LEGACY_TX', 'MMGEN_TEST_SUITE_PEXPECT', 'MMGEN_TEST_SUITE_PEXPECT_TIMEOUT', - 'MMGEN_TEST_SUITE_POPEN_SPAWN', - 'MMGEN_TEST_SUITE_ROOT_PFX') + 'MMGEN_TEST_SUITE_POPEN_SPAWN') if os.getenv('MMGEN_TEST_SUITE_POPEN_SPAWN'): Config.stdin_tty = True