Browse Source

cfg.py: new `test_suite_autosign_threaded` attr

The MMGen Project 1 year ago
parent
commit
53ebee3b61
3 changed files with 10 additions and 2 deletions
  1. 2 2
      mmgen/autosign.py
  2. 2 0
      mmgen/cfg.py
  3. 6 0
      test/cmdtest_py_d/ct_autosign.py

+ 2 - 2
mmgen/autosign.py

@@ -608,7 +608,7 @@ class Autosign:
 	async def main_loop(self):
 		if not self.cfg.stealth_led:
 			self.led.set('standby')
-		silent = self.cfg.test_suite_xmr_autosign
+		silent = self.cfg.test_suite_autosign_threaded
 		n = 1 if silent else 0
 		prev_status = False
 		while True:
@@ -628,7 +628,7 @@ class Autosign:
 		if message:
 			msg(message)
 		self.led.stop()
-		sys.exit(0 if self.cfg.test_suite_xmr_autosign else int(exit_val))
+		sys.exit(0 if self.cfg.test_suite_autosign_threaded else int(exit_val))
 
 	def init_exit_handler(self):
 

+ 2 - 0
mmgen/cfg.py

@@ -203,6 +203,7 @@ class Config(Lockable):
 	ignore_test_py_exception = False
 	test_suite               = False
 	test_suite_autosign_led_simulate = False
+	test_suite_autosign_threaded = False
 	test_suite_xmr_autosign  = False
 	test_suite_cfgtest       = False
 	test_suite_deterministic = False
@@ -287,6 +288,7 @@ class Config(Lockable):
 		'MMGEN_COLUMNS',
 		'MMGEN_TEST_SUITE',
 		'MMGEN_TEST_SUITE_AUTOSIGN_LED_SIMULATE',
+		'MMGEN_TEST_SUITE_AUTOSIGN_THREADED',
 		'MMGEN_TEST_SUITE_XMR_AUTOSIGN',
 		'MMGEN_TEST_SUITE_CFGTEST',
 		'MMGEN_TEST_SUITE_DETERMINISTIC',

+ 6 - 0
test/cmdtest_py_d/ct_autosign.py

@@ -52,6 +52,7 @@ class CmdTestAutosignBase(CmdTestBase):
 	tmpdir_nums  = [18]
 	color        = True
 	win_skip     = True
+	threaded     = False
 	daemon_coins = []
 
 	def __init__(self,trunner,cfgs,spawn):
@@ -74,6 +75,9 @@ class CmdTestAutosignBase(CmdTestBase):
 		if not self.live:
 			self.spawn_env['MMGEN_TEST_SUITE_ROOT_PFX'] = self.tmpdir
 
+		if self.threaded:
+			self.spawn_env['MMGEN_TEST_SUITE_AUTOSIGN_THREADED'] = '1'
+
 	def _create_autosign_instances(self,create_dirs):
 		d = {'offline': {'name':'asi'}}
 		if self.have_online:
@@ -90,6 +94,7 @@ class CmdTestAutosignBase(CmdTestBase):
 						'coins': ','.join(self.coins),
 						'test_suite': True,
 						'test_suite_xmr_autosign': self.name == 'CmdTestXMRAutosign',
+						'test_suite_autosign_threaded': self.threaded,
 						'test_suite_root_pfx': None if self.live else self.tmpdir,
 						'online': subdir == 'online',
 					})))
@@ -168,6 +173,7 @@ class CmdTestAutosignThreaded(CmdTestAutosignBase):
 	have_online     = True
 	live            = False
 	no_insert_check = False
+	threaded        = True
 
 	def autosign_start_thread(self):
 		def run():