From 3e766176502970bae3335e224a7330ebcdca2ec7 Mon Sep 17 00:00:00 2001 From: The MMGen Project Date: Thu, 8 Dec 2022 15:14:00 +0000 Subject: [PATCH] tw.view: create fake versions of CUR_* vars in overlay --- mmgen/tw/view.py | 8 ++------ test/overlay/fakemods/mmgen/tw/view.py | 7 +++++++ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/mmgen/tw/view.py b/mmgen/tw/view.py index 97688336..82816eeb 100755 --- a/mmgen/tw/view.py +++ b/mmgen/tw/view.py @@ -32,6 +32,7 @@ from ..util import msg,msg_r,fmt,die,capfirst,make_timestr from ..rpc import rpc_init from ..base_obj import AsyncInit +# these are replaced by fake versions in overlay: CUR_HOME = '\033[H' CUR_UP = lambda n: f'\033[{n}A' CUR_DOWN = lambda n: f'\033[{n}B' @@ -513,9 +514,7 @@ class TwView(MMGenObject,metaclass=AsyncInit): prompt += '\b' self.cursor_to_end_of_prompt = CUR_RIGHT( len(prompt.split('\n')[-1]) - 2 ) - clear_screen = ( - '\n\n' if (opt.no_blank or g.test_suite) else - CUR_HOME + ('' if scroll else ERASE_ALL) ) + clear_screen = '\n\n' if opt.no_blank else CUR_HOME + ('' if scroll else ERASE_ALL) if scroll: term = get_term() @@ -523,9 +522,6 @@ class TwView(MMGenObject,metaclass=AsyncInit): term.set('noecho') get_char = get_char_raw - if not (opt.no_blank or g.test_suite): - msg_r(CUR_HOME + ERASE_ALL) - while True: if self.oneshot_msg and scroll: diff --git a/test/overlay/fakemods/mmgen/tw/view.py b/test/overlay/fakemods/mmgen/tw/view.py index 343bc6dc..f4ee7d26 100644 --- a/test/overlay/fakemods/mmgen/tw/view.py +++ b/test/overlay/fakemods/mmgen/tw/view.py @@ -1,5 +1,12 @@ import os as overlay_fake_os from .view_orig import * +import mmgen.tw.view_orig as overlay_fake_orig_mod + +overlay_fake_orig_mod.CUR_HOME = '\n[CUR_HOME]\n' +overlay_fake_orig_mod.CUR_UP = lambda n: f'\n[CUR_UP({n})]\n' +overlay_fake_orig_mod.CUR_DOWN = lambda n: f'\n[CUR_DOWN({n})]\n' +overlay_fake_orig_mod.CUR_RIGHT = lambda n: f'\n[CUR_RIGHT({n})]\n' +overlay_fake_orig_mod.ERASE_ALL = '\n[ERASE_ALL]\n' if overlay_fake_os.getenv('MMGEN_TEST_SUITE_DETERMINISTIC'):