From 7ebfac59fdc59a16bb62c0c74d4e7899c0cefda4 Mon Sep 17 00:00:00 2001 From: MMGen Date: Mon, 27 May 2019 15:40:13 +0000 Subject: [PATCH] test.py: force correct terminal width for spawned scripts --- mmgen/globalvars.py | 2 ++ mmgen/tw.py | 2 +- test/test.py | 4 ++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/mmgen/globalvars.py b/mmgen/globalvars.py index a34f5d4c..00e85470 100755 --- a/mmgen/globalvars.py +++ b/mmgen/globalvars.py @@ -105,6 +105,7 @@ class g(object): traceback = False test_suite = False test_suite_popen_spawn = False + terminal_width = 0 # warnings mswin_pw_warning = True @@ -173,6 +174,7 @@ class g(object): 'MMGEN_TEST_SUITE', 'MMGEN_TEST_SUITE_POPEN_SPAWN', + 'MMGEN_TERMINAL_WIDTH', 'MMGEN_BOGUS_WALLET_DATA', 'MMGEN_BOGUS_SEND', 'MMGEN_DEBUG', diff --git a/mmgen/tw.py b/mmgen/tw.py index 3f38652e..ae16df0d 100755 --- a/mmgen/tw.py +++ b/mmgen/tw.py @@ -169,7 +169,7 @@ watch-only wallet using '{}-addrimport' and then re-run this program. def set_term_columns(self): from mmgen.term import get_terminal_size while True: - self.cols = get_terminal_size()[0] + self.cols = g.terminal_width or get_terminal_size()[0] if self.cols >= g.min_screen_width: break m1 = 'Screen too narrow to display the tracking wallet\n' m2 = 'Please resize your screen to at least {} characters and hit ENTER ' diff --git a/test/test.py b/test/test.py index 5255e620..675b9ecc 100755 --- a/test/test.py +++ b/test/test.py @@ -407,6 +407,10 @@ def create_tmp_dirs(shm_dir): os.symlink(src,cfgs[cfg]['tmpdir']) def set_environ_for_spawned_scripts(): + + from mmgen.term import get_terminal_size + os.environ['MMGEN_TERMINAL_WIDTH'] = str(get_terminal_size()[0]) + if os.getenv('MMGEN_DEBUG_ALL'): for name in g.env_opts: if name[:11] == 'MMGEN_DEBUG':