test suite: rename some directories

- cmdtest_py_d -> cmdtest_d
- objtest_py_d -> objtest_d
- objattrtest_py_d -> objattrtest_d

test/cmdtest.py

@@ -197,7 +197,7 @@ if cfg.no_altcoin and cfg.coin != 'BTC':
 
 set_globals(cfg)
 
-from test.cmdtest_py_d.common import ( # this must be loaded after set_globals()
+from test.cmdtest_d.common import ( # this must be loaded after set_globals()
 	get_file_with_ext,
 	confirm_continue
 )
@@ -255,7 +255,7 @@ else:
 if cfg.skipping_deps:
 	cfg.no_daemon_autostart = True
 
-from test.cmdtest_py_d.cfg import cfgs
+from test.cmdtest_d.cfg import cfgs
 
 def list_cmds():
 
@@ -321,7 +321,7 @@ class CmdGroupMgr:
 
 	dpy_data = None
 
-	from test.cmdtest_py_d.cfg import cmd_groups_dfl, cmd_groups_extra
+	from test.cmdtest_d.cfg import cmd_groups_dfl, cmd_groups_extra
 
 	cmd_groups = cmd_groups_dfl.copy()
 	cmd_groups.update(cmd_groups_extra)
@@ -367,7 +367,7 @@ class CmdGroupMgr:
 		if modname is None and 'modname' in kwargs:
 			modname = kwargs['modname']
 		import importlib
-		modpath = f'test.cmdtest_py_d.ct_{modname or gname}'
+		modpath = f'test.cmdtest_d.ct_{modname or gname}'
 		return getattr(importlib.import_module(modpath), clsname)
 
 	def create_group(self, gname, sg_name, full_data=False, modname=None, is3seed=False, add_dpy=False):
@@ -649,7 +649,7 @@ class CmdTestRunner:
 
 	def init_group(self, gname, sg_name=None, cmd=None, quiet=False, do_clean=True):
 
-		from test.cmdtest_py_d.cfg import cmd_groups_altcoin
+		from test.cmdtest_d.cfg import cmd_groups_altcoin
 		if cfg.no_altcoin and gname in cmd_groups_altcoin:
 			omsg(gray(f'INFO → skipping test group {gname!r} (--no-altcoin)'))
 			return None

test/cmdtest_py_d/cfg.py → test/cmdtest_d/cfg.py

@@ -9,7 +9,7 @@
 #   https://gitlab.com/mmgen/mmgen-wallet
 
 """
-test.cmdtest_py_d.cfg: configuration data for cmdtest.py
+test.cmdtest_d.cfg: configuration data for cmdtest.py
 """
 
 from .common import pwfile, hincog_fn, incog_id_fn, randbool

test/cmdtest_py_d/common.py → test/cmdtest_d/common.py

@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-test.cmdtest_py_d.common: Shared routines and data for the cmdtest.py test suite
+test.cmdtest_d.common: Shared routines and data for the cmdtest.py test suite
 """
 
 import sys, os

test/cmdtest_py_d/ct_automount.py → test/cmdtest_d/ct_automount.py

@@ -9,7 +9,7 @@
 #   https://gitlab.com/mmgen/mmgen-wallet
 
 """
-test.cmdtest_py_d.ct_automount: autosigning with automount tests for the cmdtest.py test suite
+test.cmdtest_d.ct_automount: autosigning with automount tests for the cmdtest.py test suite
 """
 import time
 from pathlib import Path

test/cmdtest_py_d/ct_automount_eth.py → test/cmdtest_d/ct_automount_eth.py

@@ -9,7 +9,7 @@
 #   https://gitlab.com/mmgen/mmgen-wallet
 
 """
-test.cmdtest_py_d.ct_automount_eth: Ethereum automount autosigning tests for the cmdtest.py test suite
+test.cmdtest_d.ct_automount_eth: Ethereum automount autosigning tests for the cmdtest.py test suite
 """
 import os, re
 

test/cmdtest_py_d/ct_autosign.py → test/cmdtest_d/ct_autosign.py

@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-test.cmdtest_py_d.ct_autosign: Autosign tests for the cmdtest.py test suite
+test.cmdtest_d.ct_autosign: Autosign tests for the cmdtest.py test suite
 """
 
 import sys, os, time, shutil, atexit

test/cmdtest_py_d/ct_base.py → test/cmdtest_d/ct_base.py

@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-test.cmdtest_py_d.ct_base: Base class for the cmdtest.py test suite
+test.cmdtest_d.ct_base: Base class for the cmdtest.py test suite
 """
 
 import sys, os

test/cmdtest_py_d/ct_cfgfile.py → test/cmdtest_d/ct_cfgfile.py

@@ -7,7 +7,7 @@
 # Licensed according to the terms of GPL Version 3.  See LICENSE for details.
 
 """
-test.cmdtest_py_d.ct_cfgfile: CfgFile tests for the MMGen cmdtest.py test suite
+test.cmdtest_d.ct_cfgfile: CfgFile tests for the MMGen cmdtest.py test suite
 """
 
 import sys, os, time, shutil

test/cmdtest_py_d/ct_chainsplit.py → test/cmdtest_d/ct_chainsplit.py

@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-test.cmdtest_py_d.ct_chainsplit: Forking scenario tests for the cmdtest.py test suite
+test.cmdtest_d.ct_chainsplit: Forking scenario tests for the cmdtest.py test suite
 This module is unmaintained and currently non-functional
 """
 

test/cmdtest_py_d/ct_ethdev.py → test/cmdtest_d/ct_ethdev.py

@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-test.cmdtest_py_d.ct_ethdev: Ethdev tests for the cmdtest.py test suite
+test.cmdtest_d.ct_ethdev: Ethdev tests for the cmdtest.py test suite
 """
 
 import sys, os, re, shutil, asyncio, json

test/cmdtest_py_d/ct_help.py → test/cmdtest_d/ct_help.py

@@ -9,7 +9,7 @@
 #   https://gitlab.com/mmgen/mmgen-wallet
 
 """
-test.cmdtest_py_d.ct_help: helpscreen test group for the cmdtest.py test suite
+test.cmdtest_d.ct_help: helpscreen test group for the cmdtest.py test suite
 """
 
 import sys, os, time

test/cmdtest_py_d/ct_input.py → test/cmdtest_d/ct_input.py

@@ -7,7 +7,7 @@
 # Licensed according to the terms of GPL Version 3.  See LICENSE for details.
 
 """
-test.cmdtest_py_d.ct_input: user input tests for the MMGen cmdtest.py test suite
+test.cmdtest_d.ct_input: user input tests for the MMGen cmdtest.py test suite
 """
 
 import sys, os

test/cmdtest_py_d/ct_main.py → test/cmdtest_d/ct_main.py

@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-test.cmdtest_py_d.ct_main: Basic operations tests for the cmdtest.py test suite
+test.cmdtest_d.ct_main: Basic operations tests for the cmdtest.py test suite
 """
 
 import sys, os

test/cmdtest_py_d/ct_misc.py → test/cmdtest_d/ct_misc.py

@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-test.cmdtest_py_d.ct_misc: Miscellaneous test groups for the cmdtest.py test suite
+test.cmdtest_d.ct_misc: Miscellaneous test groups for the cmdtest.py test suite
 """
 
 import sys, re

test/cmdtest_py_d/ct_opts.py → test/cmdtest_d/ct_opts.py

@@ -7,7 +7,7 @@
 # Licensed according to the terms of GPL Version 3.  See LICENSE for details.
 
 """
-test.cmdtest_py_d.ct_opts: options processing tests for the MMGen cmdtest.py test suite
+test.cmdtest_d.ct_opts: options processing tests for the MMGen cmdtest.py test suite
 """
 
 import os, time

test/cmdtest_py_d/ct_ref.py → test/cmdtest_d/ct_ref.py

@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-test.cmdtest_py_d.ct_ref: Reference file tests for the cmdtest.py test suite
+test.cmdtest_d.ct_ref: Reference file tests for the cmdtest.py test suite
 """
 
 import os

test/cmdtest_py_d/ct_ref_3seed.py → test/cmdtest_d/ct_ref_3seed.py

@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-test.cmdtest_py_d.ct_ref_3seed: Saved and generated reference file tests for 128,
+test.cmdtest_d.ct_ref_3seed: Saved and generated reference file tests for 128,
                              192 and 256-bit seeds for the cmdtest.py test suite
 """
 

test/cmdtest_py_d/ct_ref_altcoin.py → test/cmdtest_d/ct_ref_altcoin.py

@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-test.cmdtest_py_d.ct_ref_altcoin: Altcoin reference file tests for the cmdtest.py test suite
+test.cmdtest_d.ct_ref_altcoin: Altcoin reference file tests for the cmdtest.py test suite
 """
 
 from mmgen.color import set_vt100

test/cmdtest_py_d/ct_regtest.py → test/cmdtest_d/ct_regtest.py

@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-test.cmdtest_py_d.ct_regtest: Regtest tests for the cmdtest.py test suite
+test.cmdtest_d.ct_regtest: Regtest tests for the cmdtest.py test suite
 """
 
 import os, json, time, re

test/cmdtest_py_d/ct_seedsplit.py → test/cmdtest_d/ct_seedsplit.py

@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-test.cmdtest_py_d.ct_seedsplit: Seed split/join tests for the cmdtest.py test suite
+test.cmdtest_d.ct_seedsplit: Seed split/join tests for the cmdtest.py test suite
 """
 
 import os

test/cmdtest_py_d/ct_shared.py → test/cmdtest_d/ct_shared.py

@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-test.cmdtest_py_d.ct_shared: Shared methods for the cmdtest.py test suite
+test.cmdtest_d.ct_shared: Shared methods for the cmdtest.py test suite
 """
 
 from mmgen.util import get_extension

test/cmdtest_py_d/ct_tool.py → test/cmdtest_d/ct_tool.py

@@ -7,7 +7,7 @@
 # Licensed according to the terms of GPL Version 3.  See LICENSE for details.
 
 """
-test.cmdtest_py_d.ct_tool: tool tests for the MMGen cmdtest.py test suite
+test.cmdtest_d.ct_tool: tool tests for the MMGen cmdtest.py test suite
 """
 
 import sys, os

test/cmdtest_py_d/ct_wallet.py → test/cmdtest_d/ct_wallet.py

@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-test.cmdtest_py_d.ct_wallet: Wallet conversion tests for the cmdtest.py test suite
+test.cmdtest_d.ct_wallet: Wallet conversion tests for the cmdtest.py test suite
 """
 
 import sys, os

test/cmdtest_py_d/ct_xmr_autosign.py → test/cmdtest_d/ct_xmr_autosign.py

@@ -10,7 +10,7 @@
 
 
 """
-test.cmdtest_py_d.ct_xmr_autosign: xmr autosigning tests for the cmdtest.py test suite
+test.cmdtest_d.ct_xmr_autosign: xmr autosigning tests for the cmdtest.py test suite
 """
 
 import re

test/cmdtest_py_d/ct_xmrwallet.py → test/cmdtest_d/ct_xmrwallet.py

@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-test.cmdtest_py_d.ct_xmrwallet: xmrwallet tests for the cmdtest.py test suite
+test.cmdtest_d.ct_xmrwallet: xmrwallet tests for the cmdtest.py test suite
 """
 
 import sys, os, time, re, atexit, asyncio, shutil

test/cmdtest_py_d/input.py → test/cmdtest_d/input.py

@@ -7,7 +7,7 @@
 # Licensed according to the terms of GPL Version 3.  See LICENSE for details.
 
 """
-test.cmdtest_py_d.input: Shared input routines for the cmdtest.py test suite
+test.cmdtest_d.input: Shared input routines for the cmdtest.py test suite
 """
 
 import time

test/include/cfg.py

@@ -12,4 +12,4 @@
 test.include.cfg: Configuration for test scripts
 """
 
-from ..cmdtest_py_d.cfg import cfgs as clean_cfgs
+from ..cmdtest_d.cfg import cfgs as clean_cfgs

test/objattrtest.py

@@ -55,7 +55,7 @@ cfg = Config(opts_data=opts_data)
 from test.include.common import set_globals
 set_globals(cfg)
 
-from test.objattrtest_py_d.oat_common import sample_objs
+from test.objattrtest_d.oat_common import sample_objs
 
 pd = namedtuple('attr_bits', ['read_ok', 'delete_ok', 'reassign_ok', 'typeconv', 'set_none_ok'])
 perm_bits = ('read_ok', 'delete_ok', 'reassign_ok')
@@ -164,7 +164,7 @@ def test_object(mod, test_data, objname):
 
 def do_loop():
 	import importlib
-	modname = f'test.objattrtest_py_d.oat_{proto.coin.lower()}_{proto.network}'
+	modname = f'test.objattrtest_d.oat_{proto.coin.lower()}_{proto.network}'
 	mod = importlib.import_module(modname)
 	test_data = getattr(mod, 'tests')
 	gmsg(f'Running immutable attribute tests for {proto.coin} {proto.network}')

test/objattrtest_py_d/oat_btc_mainnet.py → test/objattrtest_d/oat_btc_mainnet.py

@@ -4,7 +4,7 @@
 # Copyright (C)2013-2024 The MMGen Project <mmgen@tuta.io>
 
 """
-test.objattrtest_py_d.oat_btc_mainnet: BTC mainnet test vectors for MMGen data objects
+test.objattrtest_d.oat_btc_mainnet: BTC mainnet test vectors for MMGen data objects
 """
 
 from .oat_common import sample_objs, seed_bin, atd

test/objattrtest_py_d/oat_common.py → test/objattrtest_d/oat_common.py

@@ -4,7 +4,7 @@
 # Copyright (C)2013-2024 The MMGen Project <mmgen@tuta.io>
 
 """
-test.objattrtest_py_d.oat_common: shared data for MMGen data objects tests
+test.objattrtest_d.oat_common: shared data for MMGen data objects tests
 """
 
 from decimal import Decimal

test/objtest.py

@@ -180,7 +180,7 @@ def run_test(mod, test, arg, input_data, arg1, exc_name):
 
 def do_loop():
 	import importlib
-	modname = f'test.objtest_py_d.ot_{proto.coin.lower()}_{proto.network}'
+	modname = f'test.objtest_d.ot_{proto.coin.lower()}_{proto.network}'
 	mod = importlib.import_module(modname)
 	test_data = getattr(mod, 'tests')
 	gmsg(f'Running data object tests for {proto.coin} {proto.network}')

test/objtest_py_d/ot_btc_mainnet.py → test/objtest_d/ot_btc_mainnet.py

@@ -4,7 +4,7 @@
 # Copyright (C)2013-2024 The MMGen Project <mmgen@tuta.io>
 
 """
-test.objtest_py_d.ot_btc_mainnet: BTC mainnet test vectors for MMGen data objects
+test.objtest_d.ot_btc_mainnet: BTC mainnet test vectors for MMGen data objects
 """
 
 from decimal import Decimal

test/objtest_py_d/ot_btc_testnet.py → test/objtest_d/ot_btc_testnet.py

@@ -4,7 +4,7 @@
 # Copyright (C)2013-2024 The MMGen Project <mmgen@tuta.io>
 
 """
-test.objtest_py_d.ot_btc_testnet: BTC testnet test vectors for MMGen data objects
+test.objtest_d.ot_btc_testnet: BTC testnet test vectors for MMGen data objects
 """
 
 from mmgen.key import PrivKey, WifKey

test/objtest_py_d/ot_common.py → test/objtest_d/ot_common.py

@@ -4,7 +4,7 @@
 # Copyright (C)2013-2024 The MMGen Project <mmgen@tuta.io>
 
 """
-test.objtest_py_d.ot_common: shared data for MMGen data objects tests
+test.objtest_d.ot_common: shared data for MMGen data objects tests
 """
 
 from ..include.common import getrand

test/objtest_py_d/ot_eth_mainnet.py → test/objtest_d/ot_eth_mainnet.py

@@ -4,7 +4,7 @@
 # Copyright (C)2013-2024 The MMGen Project <mmgen@tuta.io>
 
 """
-test.objtest_py_d.ot_eth_mainnet: ETH mainnet test vectors for MMGen data objects
+test.objtest_d.ot_eth_mainnet: ETH mainnet test vectors for MMGen data objects
 """
 
 from decimal import Decimal

test/objtest_py_d/ot_ltc_mainnet.py → test/objtest_d/ot_ltc_mainnet.py

@@ -4,7 +4,7 @@
 # Copyright (C)2013-2024 The MMGen Project <mmgen@tuta.io>
 
 """
-test.objtest_py_d.ot_ltc_mainnet: LTC mainnet test vectors for MMGen data objects
+test.objtest_d.ot_ltc_mainnet: LTC mainnet test vectors for MMGen data objects
 """
 
 from decimal import Decimal

test/objtest_py_d/ot_ltc_testnet.py → test/objtest_d/ot_ltc_testnet.py

@@ -4,7 +4,7 @@
 # Copyright (C)2013-2024 The MMGen Project <mmgen@tuta.io>
 
 """
-test.objtest_py_d.ot_ltc_testnet: LTC testnet test vectors for MMGen data objects
+test.objtest_d.ot_ltc_testnet: LTC testnet test vectors for MMGen data objects
 """
 
 from mmgen.addr import CoinAddr

test/test-release.d/cfg.sh

@@ -73,10 +73,10 @@ init_tests() {
 	t_lint="
 		b $pylint $PYLINT_OPTS mmgen
 		b $pylint $PYLINT_OPTS test
-		b $pylint $PYLINT_OPTS --disable=relative-beyond-top-level test/cmdtest_py_d
+		b $pylint $PYLINT_OPTS --disable=relative-beyond-top-level test/cmdtest_d
 		a $pylint $PYLINT_OPTS --ignore-paths '.*/eth/.*' mmgen
 		a $pylint $PYLINT_OPTS --ignore-paths '.*/ut_dep.py,.*/ut_testdep.py' test
-		a $pylint $PYLINT_OPTS --ignore-paths '.*/ct_ethdev.py' --disable=relative-beyond-top-level test/cmdtest_py_d
+		a $pylint $PYLINT_OPTS --ignore-paths '.*/ct_ethdev.py' --disable=relative-beyond-top-level test/cmdtest_d
 		- $pylint $PYLINT_OPTS examples
 	"
 

test/unit_tests_d/ut_testdep.py

@@ -72,7 +72,7 @@ class unit_tests:
 		return True
 
 	def ssh_socks_proxy(self, name, ut):
-		from test.cmdtest_py_d.ct_xmrwallet import CmdTestXMRWallet
+		from test.cmdtest_d.ct_xmrwallet import CmdTestXMRWallet
 		return CmdTestXMRWallet.init_proxy(external_call=True)
 
 	def sudo(self, name, ut):