cfg var rename: force_color -> test_suite_enable_color
This commit is contained in:
parent
19dc7eac26
commit
75735c8dfd
2 changed files with 4 additions and 4 deletions
|
|
@ -173,14 +173,14 @@ class Config(Lockable):
|
|||
ignore_daemon_version = False
|
||||
|
||||
# display:
|
||||
force_color = False # placeholder
|
||||
test_suite_enable_color = False # placeholder
|
||||
force_256_color = False
|
||||
scroll = False
|
||||
pager = False
|
||||
columns = 0
|
||||
color = bool(
|
||||
( sys.stdout.isatty() and not os.getenv('MMGEN_TEST_SUITE_PEXPECT') ) or
|
||||
os.getenv('MMGEN_FORCE_COLOR')
|
||||
os.getenv('MMGEN_TEST_SUITE_ENABLE_COLOR')
|
||||
)
|
||||
|
||||
# miscellaneous features:
|
||||
|
|
@ -287,6 +287,7 @@ class Config(Lockable):
|
|||
'MMGEN_TEST_SUITE_XMR_AUTOSIGN',
|
||||
'MMGEN_TEST_SUITE_CFGTEST',
|
||||
'MMGEN_TEST_SUITE_DETERMINISTIC',
|
||||
'MMGEN_TEST_SUITE_ENABLE_COLOR',
|
||||
'MMGEN_TEST_SUITE_PEXPECT',
|
||||
'MMGEN_TEST_SUITE_POPEN_SPAWN',
|
||||
'MMGEN_BLACKLIST_DAEMONS',
|
||||
|
|
@ -299,7 +300,6 @@ class Config(Lockable):
|
|||
'MMGEN_DEBUG_TW',
|
||||
'MMGEN_DEBUG_UTF8',
|
||||
'MMGEN_DEBUG_SUBSEED',
|
||||
'MMGEN_FORCE_COLOR',
|
||||
'MMGEN_FORCE_256_COLOR',
|
||||
'MMGEN_HOLD_PROTECT_DISABLE',
|
||||
'MMGEN_QUIET',
|
||||
|
|
|
|||
|
|
@ -643,7 +643,7 @@ class TestSuiteRunner(object):
|
|||
|
||||
os.environ['MMGEN_HOLD_PROTECT_DISABLE'] = '' if send_delay else '1'
|
||||
os.environ['MMGEN_TEST_SUITE_POPEN_SPAWN'] = '' if pexpect_spawn else '1'
|
||||
os.environ['MMGEN_FORCE_COLOR'] = '1' if self.ts.color else ''
|
||||
os.environ['MMGEN_TEST_SUITE_ENABLE_COLOR'] = '1' if self.ts.color else ''
|
||||
|
||||
env = { 'EXEC_WRAPPER_SPAWN':'1' }
|
||||
env.update(os.environ)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue