Merge #10318: [tests] fix wait_for_inv()

3e3c22f [tests] fix wait_for_inv() (John Newbery)

Tree-SHA512: b8070b8461e9c792cc3d9c17fd9d3faf87f550c7c0fc1788e0cd382f0794932b70cc87d480805a3b3c1ca2fdca9f8f1bcb9759300d777d9aaa8d41c016260d93
This commit is contained in:
MarcoFalke 2017-05-06 12:20:50 +02:00 committed by Pasta
parent 8c420c2983
commit d6e83980da
No known key found for this signature in database
GPG Key ID: D362C9F7142766AE
2 changed files with 6 additions and 1 deletions

0
test/functional/p2p-segwit.py Executable file
View File

View File

@ -1737,7 +1737,12 @@ class NodeConnCB(object):
assert wait_until(test_function, timeout=timeout) assert wait_until(test_function, timeout=timeout)
def wait_for_inv(self, expected_inv, timeout=60): def wait_for_inv(self, expected_inv, timeout=60):
test_function = lambda: self.last_message.get("inv") and self.last_message["inv"] != expected_inv """Waits for an INV message and checks that the first inv object in the message was as expected."""
if len(expected_inv) > 1:
raise NotImplementedError("wait_for_inv() will only verify the first inv object")
test_function = lambda: self.last_message.get("inv") and \
self.last_message["inv"].inv[0].type == expected_inv[0].type and \
self.last_message["inv"].inv[0].hash == expected_inv[0].hash
assert wait_until(test_function, timeout=timeout) assert wait_until(test_function, timeout=timeout)
def wait_for_verack(self, timeout=60): def wait_for_verack(self, timeout=60):