diff options
| author | Jonas Schnelli <dev@jonasschnelli.ch> | 2015-12-14 12:54:55 +0100 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2016-01-13 21:25:35 +0000 |
| commit | 6191a9b62831a27e40ee2fbb6429383879539700 (patch) | |
| tree | 8c06d568a6eca918d88eb4ffc8a41da3752354c5 | |
| parent | 6307beb09f9008d0756f93e4586785ee64df21d9 (diff) | |
| download | bitcoin-6191a9b62831a27e40ee2fbb6429383879539700.tar.xz | |
[RPC-Tests] add option to run rpc test over QT clients
Github-Pull: #7068
Rebased-From: 979698c1715ce86a98934e48acadbc936c95c9a3
| -rwxr-xr-x | qa/rpc-tests/test_framework/test_framework.py | 2 | ||||
| -rw-r--r-- | qa/rpc-tests/test_framework/util.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/qa/rpc-tests/test_framework/test_framework.py b/qa/rpc-tests/test_framework/test_framework.py index 60f1dcfdf6..584f318d0b 100755 --- a/qa/rpc-tests/test_framework/test_framework.py +++ b/qa/rpc-tests/test_framework/test_framework.py @@ -120,7 +120,7 @@ class BitcoinTestFramework(object): if 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() diff --git a/qa/rpc-tests/test_framework/util.py b/qa/rpc-tests/test_framework/util.py index 1333311dc2..0388e08115 100644 --- a/qa/rpc-tests/test_framework/util.py +++ b/qa/rpc-tests/test_framework/util.py @@ -131,7 +131,7 @@ def initialize_chain(test_dir): # Create cache directories, run bitcoinds: for i in range(4): 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: args.append("-connect=127.0.0.1:"+str(p2p_port(0))) 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: binary = os.getenv("BITCOIND", "bitcoind") # 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) bitcoind_processes[i] = subprocess.Popen(args) devnull = open(os.devnull, "w") |