From d6e83980da97ea27279c21156e31d0e2285ff7c7 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Sat, 6 May 2017 12:20:50 +0200 Subject: [PATCH] Merge #10318: [tests] fix wait_for_inv() 3e3c22f [tests] fix wait_for_inv() (John Newbery) Tree-SHA512: b8070b8461e9c792cc3d9c17fd9d3faf87f550c7c0fc1788e0cd382f0794932b70cc87d480805a3b3c1ca2fdca9f8f1bcb9759300d777d9aaa8d41c016260d93 --- test/functional/p2p-segwit.py | 0 test/functional/test_framework/mininode.py | 7 ++++++- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100755 test/functional/p2p-segwit.py diff --git a/test/functional/p2p-segwit.py b/test/functional/p2p-segwit.py new file mode 100755 index 0000000000..e69de29bb2 diff --git a/test/functional/test_framework/mininode.py b/test/functional/test_framework/mininode.py index bcc7db8bb7..de93038faa 100755 --- a/test/functional/test_framework/mininode.py +++ b/test/functional/test_framework/mininode.py @@ -1737,7 +1737,12 @@ class NodeConnCB(object): assert wait_until(test_function, timeout=timeout) 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) def wait_for_verack(self, timeout=60):