aboutsummaryrefslogtreecommitdiff
path: root/test/functional
diff options
context:
space:
mode:
authorJohn Newbery <john@johnnewbery.com>2017-08-23 15:49:01 -0400
committerMarcoFalke <falke.marco@gmail.com>2017-10-03 18:42:57 +0200
commit11a5992c90d4cc9a3823ea08dab2c078bcbf15d2 (patch)
tree8650c8035ae9a4b6f76ac52be4e79f1697f56fdf /test/functional
parent847c75ec6447f58b6c4f3732a10551f1faddbb0b (diff)
downloadbitcoin-11a5992c90d4cc9a3823ea08dab2c078bcbf15d2.tar.xz
[tests] fix - use rpc_timeout as rpc timeout
Github-Pull: #11121 Rebased-From: be2a2ab6a67beef97e3c3cf42bd5eeea6c4e55cf
Diffstat (limited to 'test/functional')
-rwxr-xr-xtest/functional/test_framework/test_node.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/functional/test_framework/test_node.py b/test/functional/test_framework/test_node.py
index 7c1325e691..553c7c9d20 100755
--- a/test/functional/test_framework/test_node.py
+++ b/test/functional/test_framework/test_node.py
@@ -78,7 +78,7 @@ class TestNode():
for _ in range(poll_per_s * self.rpc_timeout):
assert self.process.poll() is None, "bitcoind exited with status %i during initialization" % self.process.returncode
try:
- self.rpc = get_rpc_proxy(rpc_url(self.datadir, self.index, self.rpchost), self.index, coveragedir=self.coverage_dir)
+ self.rpc = get_rpc_proxy(rpc_url(self.datadir, self.index, self.rpchost), self.index, timeout=self.rpc_timeout, coveragedir=self.coverage_dir)
self.rpc.getblockcount()
# If the call to getblockcount() succeeds then the RPC connection is up
self.rpc_connected = True