From b640dea1117b7dc2a2f8dd47778ed1919bcc3c04 Mon Sep 17 00:00:00 2001 From: The MMGen Project Date: Tue, 25 Oct 2022 09:10:15 +0000 Subject: [PATCH] update for MMGen v13.3.dev11 --- mmgen_node_tools/PeerBlocks.py | 1 + mmgen_node_tools/data/version | 2 +- setup.cfg | 2 +- test/test-release.d/cfg.sh | 57 ++++++++++------------------------ test/test_py_d/ts_main.py | 6 ++-- 5 files changed, 23 insertions(+), 45 deletions(-) diff --git a/mmgen_node_tools/PeerBlocks.py b/mmgen_node_tools/PeerBlocks.py index a6027ca..e38af23 100755 --- a/mmgen_node_tools/PeerBlocks.py +++ b/mmgen_node_tools/PeerBlocks.py @@ -67,6 +67,7 @@ class Display(PollDisplay): with self.info_lock: msg('') term.reset() + # readline required for correct operation here; without it, user must re-type first digit ret = line_input('peer number> ',insert_txt=s,hold_protect=False) term.init(noecho=True) self.enable_display = False # prevent display from updating before process_input() diff --git a/mmgen_node_tools/data/version b/mmgen_node_tools/data/version index 1ebddf5..e2195ce 100644 --- a/mmgen_node_tools/data/version +++ b/mmgen_node_tools/data/version @@ -1 +1 @@ -3.1.dev9 +3.1.dev10 diff --git a/setup.cfg b/setup.cfg index 208e03b..0be313f 100644 --- a/setup.cfg +++ b/setup.cfg @@ -23,7 +23,7 @@ python_requires = >=3.7 include_package_data = True install_requires = - mmgen>=13.3.dev9 + mmgen>=13.3.dev11 packages = mmgen_node_tools diff --git a/test/test-release.d/cfg.sh b/test/test-release.d/cfg.sh index ba2f6ce..866f453 100755 --- a/test/test-release.d/cfg.sh +++ b/test/test-release.d/cfg.sh @@ -18,27 +18,18 @@ # mmnode-ticker OK # mmnode-txfind - -list_avail_tests() { - echo "AVAILABLE TESTS:" - echo " unit - unit tests" - echo " btc_rt - Bitcoin regtest" - echo " bch_rt - Bitcoin Cash Node (BCH) regtest" - echo " ltc_rt - Litecoin regtest" - echo " scripts - tests of scripts not requiring a coin daemon" - echo " misc - miscellaneous tests that don't fit in the above categories" - echo - echo "AVAILABLE TEST GROUPS:" - echo " default - All tests minus the extra tests" - echo " extra - All tests minus the default tests" - echo " noalt - BTC-only tests" - echo " quick - Default tests minus btc_tn, bch, bch_rt, ltc and ltc_rt" - echo " qskip - The tests skipped in the 'quick' test group" - echo - echo "By default, all tests are run" -} +all_tests='unit misc scripts btc btc_rt bch_rt ltc_rt' + +groups_desc=" + default - All tests minus the extra tests + extra - All tests minus the default tests + noalt - BTC-only tests + quick - Default tests minus btc_tn, bch, bch_rt, ltc and ltc_rt + qskip - The tests skipped in the 'quick' test group +" init_groups() { - dfl_tests='unit misc scripts btc btc_rt bch_rt ltc_rt' + dfl_tests=$all_tests extra_tests='' noalt_tests='unit misc scripts btc btc_rt' quick_tests='unit misc scripts btc btc_rt' @@ -46,38 +37,24 @@ init_groups() { } init_tests() { - i_unit='Unit' - s_unit="The following tests will test various low-level subsystems" + d_unit="low-level subsystems" t_unit="- $unit_tests_py" - f_unit='Unit tests completed' - i_misc='Misc' - s_misc="The following tests will test miscellaneous script features" + d_misc="miscellaneous features" t_misc="- $test_py helpscreens" - f_misc='Misc tests completed' - i_scripts='No-daemon scripts' - s_scripts="The following tests will test scripts not requiring a coin daemon" + d_scripts="scripts not requiring a coin daemon" t_scripts="- $test_py scripts" - f_scripts='No-daemon script tests completed' - i_btc='Bitcoin fake RPC data' - s_btc="The following tests will test various scripts with fake RPC data" + d_btc="Bitcoin with emulated RPC data" t_btc="- $test_py main" - f_btc='Bitcoin fake RPC data tests completed' - i_btc_rt='Bitcoin regtest' - s_btc_rt="The following tests will test various scripts using regtest mode" + d_btc_rt="Bitcoin regtest" t_btc_rt="- $test_py regtest" - f_btc_rt='Regtest mode tests for BTC completed' - i_bch_rt='BitcoinCashNode (BCH) regtest' - s_bch_rt="The following tests will test various scripts using regtest mode" + d_bch_rt="Bitcoin Cash Node (BCH) regtest" t_bch_rt="- $test_py --coin=bch regtest" - f_bch_rt='Regtest mode tests for BCH completed' - i_ltc_rt='Litecoin regtest' - s_ltc_rt="The following tests will test various scripts using regtest mode" + d_ltc_rt="Litecoin regtest" t_ltc_rt="- $test_py --coin=ltc regtest" - f_ltc_rt='Regtest mode tests for LTC completed' } diff --git a/test/test_py_d/ts_main.py b/test/test_py_d/ts_main.py index 7974c58..aa175cc 100755 --- a/test/test_py_d/ts_main.py +++ b/test/test_py_d/ts_main.py @@ -71,19 +71,19 @@ class TestSuiteMain(TestSuiteBase): t.send('0') time.sleep(0.2) - t.send('\n') + t.send('\n' if opt.pexpect_spawn else '0\n') # TODO: check for readline availability t.expect('Unable to disconnect peer 0') t.expect('PEERS') t.send('1') time.sleep(0.2) - t.send('1\n') + t.send('1\n' if opt.pexpect_spawn else '11\n') t.expect('11: invalid peer number') t.expect('PEERS') t.send('2') time.sleep(0.2) - t.send('\n') + t.send('\n' if opt.pexpect_spawn else '2\n') t.expect('Disconnecting peer 2') t.expect('PEERS')