DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Make the REGTEST AC special in our test suite, so we get a predictable rpc port number

Browse Source
This commit is contained in:
Jonathan "Duke" Leto
2018-08-11 19:14:51 +02:00
parent 2f1319dcfc
commit 941619eb46
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
qa/rpc-tests/cryptoconditions.py
View File

@@ -26,10 +26,11 @@ class CryptoConditionsTest (BitcoinTestFramework):
self.privkey = "UqMgxk7ySPNQ4r9nKAFPjkXy6r5t898yhuNCjSZJLg3RAM4WW1m9" self.privkey = "UqMgxk7ySPNQ4r9nKAFPjkXy6r5t898yhuNCjSZJLg3RAM4WW1m9"
self.nodes = start_nodes(self.num_nodes, self.options.tmpdir, self.nodes = start_nodes(self.num_nodes, self.options.tmpdir,
extra_args=[[ extra_args=[[
# always give -ac_name as first extra_arg
'-ac_name=REGTEST',
'-conf='+self.options.tmpdir+'/node0/REGTEST.conf', '-conf='+self.options.tmpdir+'/node0/REGTEST.conf',
'-port=64367', '-port=64367',
'-rpcport=64368', '-rpcport=64368',
'-ac_name=REGTEST',
'-regtest', '-regtest',
'-addressindex=1', '-addressindex=1',
'-spentindex=1', '-spentindex=1',

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

@@ -223,9 +223,10 @@ def start_node(i, dirname, extra_args=None, rpchost=None, timewait=None, binary=
if os.getenv("PYTHON_DEBUG", ""): if os.getenv("PYTHON_DEBUG", ""):
print "start_node: calling komodo-cli -rpcwait getblockcount returned" print "start_node: calling komodo-cli -rpcwait getblockcount returned"
devnull.close() devnull.close()
#url = "http://rt:rt@%s:%d" % (rpchost or '127.0.0.1', rpc_port(i)) if extra_args[0] == '-ac_name=REGTEST':
#TODO: this breaks non CC tests url = "http://rt:rt@%s:%d" % (rpchost or '127.0.0.1', 64368)
url = "http://rt:rt@%s:%d" % (rpchost or '127.0.0.1', 64368) else:
url = "http://rt:rt@%s:%d" % (rpchost or '127.0.0.1', rpc_port(i))
print("connecting to " + url) print("connecting to " + url)
if timewait is not None: if timewait is not None:
proxy = AuthServiceProxy(url, timeout=timewait) proxy = AuthServiceProxy(url, timeout=timewait)