diff --git a/test/README.md b/test/README.md index 26fd525064e62b..e7dbc01657fdb6 100644 --- a/test/README.md +++ b/test/README.md @@ -204,7 +204,7 @@ test run: Use the path to find the pid file in the temp folder: ```bash -cat /tmp/user/1000/testo9vsdjo3/node1/regtest/bitcoind.pid +cat /tmp/user/1000/testo9vsdjo3/node1/regtest2/bitcoind.pid ``` Then you can use the pid to start `gdb`: diff --git a/test/functional/combine_logs.py b/test/functional/combine_logs.py index 367d0f69165b68..0fe5d3015bec70 100755 --- a/test/functional/combine_logs.py +++ b/test/functional/combine_logs.py @@ -83,7 +83,7 @@ def read_logs(tmp_dir): chain = chain[0] # pick the first one if more than one chain was found (should never happen) chain = re.search(r'node0/(.+?)/debug\.log$', chain).group(1) # extract the chain name else: - chain = 'regtest' # fallback to regtest (should only happen when none exists) + chain = 'regtest2' # fallback to regtest2 (should only happen when none exists) files = [("test", "%s/test_framework.log" % tmp_dir)] for i in itertools.count(): diff --git a/test/functional/rpc_getblockstats.py b/test/functional/rpc_getblockstats.py index efab69ac2632d6..b6a7d048cd7073 100755 --- a/test/functional/rpc_getblockstats.py +++ b/test/functional/rpc_getblockstats.py @@ -31,6 +31,7 @@ def add_options(self, parser): help='Test data file') def set_test_params(self): + self.chain = 'regtest' self.num_nodes = 1 self.setup_clean_chain = True diff --git a/test/functional/test_framework/mininode.py b/test/functional/test_framework/mininode.py index 166438cf70bb2a..51536b1d02719b 100755 --- a/test/functional/test_framework/mininode.py +++ b/test/functional/test_framework/mininode.py @@ -83,9 +83,10 @@ } MAGIC_BYTES = { - "mainnet": b"\xf9\xbe\xb4\xd9", # mainnet + "main": b"\xf9\xbe\xb4\xd9", # mainnet "testnet3": b"\x0b\x11\x09\x07", # testnet3 "regtest": b"\xfa\xbf\xb5\xda", # regtest + "regtest2": b"\xfa\xbf\xb5\xda", # -chain=regtest2 } diff --git a/test/functional/test_framework/test_framework.py b/test/functional/test_framework/test_framework.py index 780aa5fe03ebd5..ac10105eba3dbd 100755 --- a/test/functional/test_framework/test_framework.py +++ b/test/functional/test_framework/test_framework.py @@ -91,7 +91,7 @@ class BitcoinTestFramework(metaclass=BitcoinTestMetaClass): def __init__(self): """Sets test framework defaults. Do not override this method. Instead, override the set_test_params() method""" - self.chain = 'regtest' + self.chain = 'regtest2' self.setup_clean_chain = False self.nodes = [] self.network_thread = None