sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-27 13:03:17 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

De-dashify env vars and dashify help text in tests instead (#2603)

Browse Source
This commit is contained in:
UdjinM6 2019-01-03 12:19:46 +03:00 committed by GitHub
parent a49f4123e5
commit c58f775cc2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qa/rpc-tests/maxblocksinflight.py
View File

@ -73,7 +73,7 @@ class TestManager(NodeConnCB):
class MaxBlocksInFlightTest(BitcoinTestFramework): class MaxBlocksInFlightTest(BitcoinTestFramework):
def add_options(self, parser): def add_options(self, parser):
parser.add_option("--testbinary", dest="testbinary", parser.add_option("--testbinary", dest="testbinary",
default=os.getenv("DASHD", "dashd"), default=os.getenv("BITCOIND", "dashd"),
help="Binary to test max block requests behavior") help="Binary to test max block requests behavior")
def __init__(self): def __init__(self):

4
qa/rpc-tests/p2p-acceptblock.py
View File

@ -108,8 +108,8 @@ class TestNode(NodeConnCB):
class AcceptBlockTest(BitcoinTestFramework): class AcceptBlockTest(BitcoinTestFramework):
def add_options(self, parser): def add_options(self, parser):
parser.add_option("--testbinary", dest="testbinary", parser.add_option("--testbinary", dest="testbinary",
default=os.getenv("DASHD", "dashd"), default=os.getenv("BITCOIND", "dashd"),
help="bitcoind binary to test") help="dashd binary to test")
def __init__(self): def __init__(self):
super().__init__() super().__init__()

8
qa/rpc-tests/test_framework/test_framework.py
View File

@ -392,11 +392,11 @@ class ComparisonTestFramework(BitcoinTestFramework):
def add_options(self, parser): def add_options(self, parser):
parser.add_option("--testbinary", dest="testbinary", parser.add_option("--testbinary", dest="testbinary",
default=os.getenv("DASHD", "dashd"), default=os.getenv("BITCOIND", "dashd"),
help="bitcoind binary to test") help="dashd binary to test")
parser.add_option("--refbinary", dest="refbinary", parser.add_option("--refbinary", dest="refbinary",
default=os.getenv("DASHD", "dashd"), default=os.getenv("BITCOIND", "dashd"),
help="bitcoind binary to use for reference nodes (if any)") help="dashd binary to use for reference nodes (if any)")
def setup_network(self): def setup_network(self):
self.nodes = start_nodes( self.nodes = start_nodes(

4
qa/rpc-tests/test_framework/util.py
View File

@ -274,7 +274,7 @@ def initialize_chain(test_dir, num_nodes, cachedir, extra_args=None, redirect_st
# Create cache directories, run dashds: # Create cache directories, run dashds:
for i in range(MAX_NODES): for i in range(MAX_NODES):
datadir=initialize_datadir(cachedir, i) datadir=initialize_datadir(cachedir, i)
args = [ os.getenv("DASHD", "dashd"), "-server", "-keypool=1", "-datadir="+datadir, "-discover=0", "-mocktime="+str(GENESISTIME) ] args = [ os.getenv("BITCOIND", "dashd"), "-server", "-keypool=1", "-datadir="+datadir, "-discover=0", "-mocktime="+str(GENESISTIME) ]
if i > 0: if i > 0:
args.append("-connect=127.0.0.1:"+str(p2p_port(0))) args.append("-connect=127.0.0.1:"+str(p2p_port(0)))
if extra_args is not None: if extra_args is not None:
@ -362,7 +362,7 @@ def start_node(i, dirname, extra_args=None, rpchost=None, timewait=None, binary=
""" """
datadir = os.path.join(dirname, "node"+str(i)) datadir = os.path.join(dirname, "node"+str(i))
if binary is None: if binary is None:
binary = os.getenv("DASHD", "dashd") binary = os.getenv("BITCOIND", "dashd")
# RPC tests still depend on free transactions # RPC tests still depend on free transactions
args = [ binary, "-datadir="+datadir, "-server", "-keypool=1", "-discover=0", "-rest", "-blockprioritysize=50000", "-mocktime="+str(get_mocktime()) ] args = [ binary, "-datadir="+datadir, "-server", "-keypool=1", "-discover=0", "-rest", "-blockprioritysize=50000", "-mocktime="+str(get_mocktime()) ]
# Don't try auto backups (they fail a lot when running tests) # Don't try auto backups (they fail a lot when running tests)