sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-26 20:42:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

[RPC-Tests] add option to run rpc test over QT clients

Browse Source 
Github-Pull: #7068
Rebased-From: 979698c171
This commit is contained in:
Jonas Schnelli 2015-12-14 12:54:55 +01:00 committed by Luke Dashjr
parent 6307beb09f
commit 6191a9b628
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -120,7 +120,7 @@ class BitcoinTestFramework(object):
if self.options.coveragedir: if self.options.coveragedir:
enable_coverage(self.options.coveragedir) enable_coverage(self.options.coveragedir)
os.environ['PATH'] = self.options.srcdir+":"+os.environ['PATH'] os.environ['PATH'] = self.options.srcdir+":"+self.options.srcdir+"/qt:"+os.environ['PATH']
check_json_precision() check_json_precision()

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

@ -131,7 +131,7 @@ def initialize_chain(test_dir):
# Create cache directories, run bitcoinds: # Create cache directories, run bitcoinds:
for i in range(4): for i in range(4):
datadir=initialize_datadir("cache", i) datadir=initialize_datadir("cache", i)
args = [ os.getenv("BITCOIND", "bitcoind"), "-keypool=1", "-datadir="+datadir, "-discover=0" ] args = [ os.getenv("BITCOIND", "bitcoind"), "-server", "-keypool=1", "-datadir="+datadir, "-discover=0" ]
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)))
bitcoind_processes[i] = subprocess.Popen(args) bitcoind_processes[i] = subprocess.Popen(args)
@ -219,7 +219,7 @@ def start_node(i, dirname, extra_args=None, rpchost=None, timewait=None, binary=
if binary is None: if binary is None:
binary = os.getenv("BITCOIND", "bitcoind") binary = os.getenv("BITCOIND", "bitcoind")
# RPC tests still depend on free transactions # RPC tests still depend on free transactions
args = [ binary, "-datadir="+datadir, "-keypool=1", "-discover=0", "-rest", "-blockprioritysize=50000" ] args = [ binary, "-datadir="+datadir, "-server", "-keypool=1", "-discover=0", "-rest", "-blockprioritysize=50000" ]
if extra_args is not None: args.extend(extra_args) if extra_args is not None: args.extend(extra_args)
bitcoind_processes[i] = subprocess.Popen(args) bitcoind_processes[i] = subprocess.Popen(args)
devnull = open(os.devnull, "w") devnull = open(os.devnull, "w")