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

Improve faucetaddress tests

Browse Source
This commit is contained in:
Jonathan "Duke" Leto
2018-08-07 21:45:32 +02:00
parent 8d454fb58e
commit d48c67574f
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -62,7 +62,10 @@ class CryptoConditionsTest (BitcoinTestFramework):
# Begin actual CC tests # Begin actual CC tests
faucet = rpc.faucetaddress() faucet = rpc.faucetaddress()
assert_equal(faucet['result'], 'success') assert_equal(faucet['result'], 'success')
assert_equal(faucet['myaddress'][0], 'R') # verify all keys look like valid AC addrs, could be better
for x in ['myCCaddress', 'FaucetCCaddress', 'Faucetmarker', 'myaddress']:
assert_equal(faucet[x][0], 'R')
if __name__ == '__main__': if __name__ == '__main__':
CryptoConditionsTest ().main () CryptoConditionsTest ().main ()

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

@@ -208,7 +208,6 @@ def start_node(i, dirname, extra_args=None, rpchost=None, timewait=None, binary=
cmd = os.getenv("BITCOINCLI", "komodo-cli") cmd = os.getenv("BITCOINCLI", "komodo-cli")
print("cmd=" + cmd) print("cmd=" + cmd)
#TODO: this will only work on the regtest AC, and probably breaks non-CC tests
cmd_args = ' '.join(extra_args) + " -rpcwait getblockcount " cmd_args = ' '.join(extra_args) + " -rpcwait getblockcount "
if os.getenv("PYTHON_DEBUG", ""): if os.getenv("PYTHON_DEBUG", ""):
print "start_node: komodod started, calling : " + cmd + " " + cmd_args print "start_node: komodod started, calling : " + cmd + " " + cmd_args
@@ -225,6 +224,7 @@ def start_node(i, dirname, extra_args=None, rpchost=None, timewait=None, binary=
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)) #url = "http://rt:rt@%s:%d" % (rpchost or '127.0.0.1', rpc_port(i))
#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)
print("connecting to " + url) print("connecting to " + url)
if timewait is not None: if timewait is not None: