diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2016-10-01 11:36:25 +0200 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2016-10-03 10:59:49 +0200 |
| commit | 1f60d455048b7c0af6a5fdc032022d3fac37e790 (patch) | |
| tree | 9fe1a09ec3aca09ef5f1c7e900dfc60572cd2c82 | |
| parent | 624a007f476027457b32e0bd42584e67bb003317 (diff) | |
| download | bitcoin-1f60d455048b7c0af6a5fdc032022d3fac37e790.tar.xz | |
[qa] mininode: Only allow named args in wait_until
Github-Pull: #8857
Rebased-From: fa666094cf5b9ac4a7c1732a7ffa001afffcd938
| -rwxr-xr-x | qa/rpc-tests/maxuploadtarget.py | 2 | ||||
| -rwxr-xr-x | qa/rpc-tests/p2p-mempool.py | 2 | ||||
| -rwxr-xr-x | qa/rpc-tests/test_framework/mininode.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/qa/rpc-tests/maxuploadtarget.py b/qa/rpc-tests/maxuploadtarget.py index 125d4eb275..d0e9fe9a3f 100755 --- a/qa/rpc-tests/maxuploadtarget.py +++ b/qa/rpc-tests/maxuploadtarget.py @@ -75,7 +75,7 @@ class TestNode(NodeConnCB): def received_pong(): return (self.last_pong.nonce == self.ping_counter) self.connection.send_message(msg_ping(nonce=self.ping_counter)) - success = wait_until(received_pong, timeout) + success = wait_until(received_pong, timeout=timeout) self.ping_counter += 1 return success diff --git a/qa/rpc-tests/p2p-mempool.py b/qa/rpc-tests/p2p-mempool.py index 5d2daf39f8..80948426d9 100755 --- a/qa/rpc-tests/p2p-mempool.py +++ b/qa/rpc-tests/p2p-mempool.py @@ -63,7 +63,7 @@ class TestNode(NodeConnCB): def received_pong(): return (self.last_pong.nonce == self.ping_counter) self.connection.send_message(msg_ping(nonce=self.ping_counter)) - success = wait_until(received_pong, timeout) + success = wait_until(received_pong, timeout=timeout) self.ping_counter += 1 return success diff --git a/qa/rpc-tests/test_framework/mininode.py b/qa/rpc-tests/test_framework/mininode.py index 0b7b17cdb5..88a3b7e0f7 100755 --- a/qa/rpc-tests/test_framework/mininode.py +++ b/qa/rpc-tests/test_framework/mininode.py @@ -1320,7 +1320,7 @@ class msg_reject(object): % (self.message, self.code, self.reason, self.data) # Helper function -def wait_until(predicate, attempts=float('inf'), timeout=float('inf')): +def wait_until(predicate, *, attempts=float('inf'), timeout=float('inf')): attempt = 0 elapsed = 0 |