From 2e68cc095bf057583c871eabcbcc4f086e4b9b1b Mon Sep 17 00:00:00 2001 From: The MMGen Project Date: Sat, 1 Apr 2023 12:25:28 +0000 Subject: [PATCH] license message bugfix and test --- mmgen/contrib/license.py | 4 ++-- mmgen/data/release_date | 2 +- mmgen/data/version | 2 +- test/test_py_d/ts_misc.py | 18 ++++++++++++++++++ 4 files changed, 22 insertions(+), 4 deletions(-) diff --git a/mmgen/contrib/license.py b/mmgen/contrib/license.py index 82b76bd0..95eb4e4e 100755 --- a/mmgen/contrib/license.py +++ b/mmgen/contrib/license.py @@ -20,10 +20,10 @@ contrib.license: Copyright notice and text of GPLv3 """ -from ..globalvars import g +from ..globalvars import gc warning = f""" - {g.proj_name} Copyright (C) {g.Cdates} by {g.author} {g.email}. This + {gc.proj_name} Copyright (C) {gc.Cdates} by {gc.author} {gc.email}. This program comes with ABSOLUTELY NO WARRANTY. This is free software, and you are welcome to redistribute it under certain conditions. """ diff --git a/mmgen/data/release_date b/mmgen/data/release_date index c4a05afe..40f7e134 100644 --- a/mmgen/data/release_date +++ b/mmgen/data/release_date @@ -1 +1 @@ -March 2023 +April 2023 diff --git a/mmgen/data/version b/mmgen/data/version index 98742796..7d783022 100644 --- a/mmgen/data/version +++ b/mmgen/data/version @@ -1 +1 @@ -13.3.dev42 +13.3.dev43 diff --git a/test/test_py_d/ts_misc.py b/test/test_py_d/ts_misc.py index 54541d95..5535ce6a 100755 --- a/test/test_py_d/ts_misc.py +++ b/test/test_py_d/ts_misc.py @@ -98,6 +98,7 @@ class TestSuiteHelp(TestSuiteBase): cmd_group = ( ('usage', (1,'usage message',[])), ('version', (1,'version message',[])), + ('license', (1,'license message',[])), ('helpscreens', (1,'help screens', [])), ('longhelpscreens', (1,'help screens (--longhelp)',[])), ('show_hash_presets', (1,'info screen (--show-hash-presets)',[])), @@ -118,6 +119,23 @@ class TestSuiteHelp(TestSuiteBase): t.expect('MMGEN-TOOL version') return t + def license(self): + lsave = os.getenv('MMGEN_NO_LICENSE') + os.environ['MMGEN_NO_LICENSE'] = '' + t = self.spawn(f'mmgen-walletconv',['--stdout','--in-fmt=hex','--out-fmt=hex']) + t.expect('to continue: ', 'w') + t.expect('TERMS AND CONDITIONS') # start of GPL text + if cfg.pexpect_spawn: + t.send('G') + t.expect('return for a fee.') # end of GPL text + if cfg.pexpect_spawn: + t.send('q') + t.expect('to continue: ', 'c') + t.expect('data: ','beadcafe'*4 + '\n') + t.expect('to confirm: ', 'YES\n') + os.environ['MMGEN_NO_LICENSE'] = lsave + return t + def spawn_chk_expect(self,*args,**kwargs): expect = kwargs.pop('expect') t = self.spawn(*args,**kwargs)