From 0ef7a58487800df0b7873be8f6e7f819b7b5f892 Mon Sep 17 00:00:00 2001
From: The MMGen Project <mmgen@tuta.io>
Date: Fri, 11 Sep 2026 14:10:56 +0000
Subject: [PATCH] CmdTestRunner: remove `spawn_env_override` param

---
 test/cmdtest_d/autosign.py       | 2 +-
 test/cmdtest_d/include/runner.py | 3 +--
 test/cmdtest_d/shared.py         | 2 ++
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/test/cmdtest_d/autosign.py b/test/cmdtest_d/autosign.py
index 1bde1508..e9b8a29d 100755
--- a/test/cmdtest_d/autosign.py
+++ b/test/cmdtest_d/autosign.py
@@ -625,7 +625,7 @@ class CmdTestAutosignThreaded(CmdTestAutosignBase):
 				+ ['--full-summary', 'wait'],
 			direct_exec      = True,
 			no_passthru_opts = True,
-			spawn_env_override = self.spawn_env | {'EXEC_WRAPPER_DO_RUNTIME_MSG': ''})
+			env = {'EXEC_WRAPPER_DO_RUNTIME_MSG': ''})
 		self.write_to_tmpfile('autosign_thread_pid', str(t.ep.pid))
 		return t
 
diff --git a/test/cmdtest_d/include/runner.py b/test/cmdtest_d/include/runner.py
index 05b0c81a..16805619 100755
--- a/test/cmdtest_d/include/runner.py
+++ b/test/cmdtest_d/include/runner.py
@@ -141,7 +141,6 @@ class CmdTestRunner:
 			pexpect_spawn   = None,
 			direct_exec     = False,
 			no_passthru_opts = False,
-			spawn_env_override = None,
 			exit_val        = None,
 			silent          = False,
 			env             = {}):
@@ -213,7 +212,7 @@ class CmdTestRunner:
 		send_delay = 0.4 if pexpect_spawn is True or self.cfg.buf_keypress else None
 		pexpect_spawn = pexpect_spawn if pexpect_spawn is not None else bool(self.cfg.pexpect_spawn)
 
-		spawn_env = dict(spawn_env_override or self.tg.spawn_env)
+		spawn_env = dict(self.tg.spawn_env)
 		spawn_env.update({
 			'MMGEN_HOLD_PROTECT_DISABLE': '' if send_delay else '1',
 			'MMGEN_TEST_SUITE_POPEN_SPAWN': '' if pexpect_spawn else '1',
diff --git a/test/cmdtest_d/shared.py b/test/cmdtest_d/shared.py
index 0b96ad65..d9134b0e 100755
--- a/test/cmdtest_d/shared.py
+++ b/test/cmdtest_d/shared.py
@@ -232,6 +232,7 @@ class CmdTestShared:
 			extra_opts = [],
 			extra_desc = '',
 			expect_str = None,
+			env        = {},
 			view       = 'n',
 			dfl_wallet = False):
 		opts = extra_opts + ['-d', self.tmpdir, txfile] + ([wf] if wf else [])
@@ -241,6 +242,7 @@ class CmdTestShared:
 			opts,
 			extra_desc,
 			no_passthru_opts = ['coin'],
+			env = env,
 			exit_val = None if save or (wcls.enc and wcls.type != 'brain') else 1)
 		t.license()
 		if expect_str: