diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2016-10-02 23:14:01 +0200 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2016-10-02 23:14:17 +0200 |
| commit | 6013c73b3312e11b447ed387426749014716f820 (patch) | |
| tree | dfd0360b6b7dabfa04534e8a9e54f5c0e23504dd | |
| parent | 6faffb8a83db3f209a303a4464dbdd597faad5a4 (diff) | |
| parent | fa666094cf5b9ac4a7c1732a7ffa001afffcd938 (diff) | |
Merge #8857: [qa] mininode: Only allow named args in wait_until
fa66609 [qa] mininode: Only allow named args in wait_until (MarcoFalke)
| -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 5c5d778f42..382d7f1e82 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 |