diff options
author | MarcoFalke <falke.marco@gmail.com> | 2017-05-06 12:20:50 +0200 |
---|---|---|
committer | MarcoFalke <falke.marco@gmail.com> | 2017-05-06 12:21:01 +0200 |
commit | 170bc2c381f86a523de2fc8b71d62ade66303c0d (patch) | |
tree | e6728fff792cbeb0e329319ad2d5c2062ae9dd83 | |
parent | 314ebdfcb38d4b4c977579f787d5e1a20d068c94 (diff) | |
parent | 3e3c22f09d37169fa88327323c3755be6dbd9a62 (diff) | |
download | bitcoin-170bc2c381f86a523de2fc8b71d62ade66303c0d.tar.xz |
Merge #10318: [tests] fix wait_for_inv()
3e3c22f [tests] fix wait_for_inv() (John Newbery)
Tree-SHA512: b8070b8461e9c792cc3d9c17fd9d3faf87f550c7c0fc1788e0cd382f0794932b70cc87d480805a3b3c1ca2fdca9f8f1bcb9759300d777d9aaa8d41c016260d93
-rwxr-xr-x | test/functional/p2p-segwit.py | 4 | ||||
-rwxr-xr-x | test/functional/test_framework/mininode.py | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/test/functional/p2p-segwit.py b/test/functional/p2p-segwit.py index 93d42b3df0..24d4d37c42 100755 --- a/test/functional/p2p-segwit.py +++ b/test/functional/p2p-segwit.py @@ -916,9 +916,9 @@ class SegWitTest(BitcoinTestFramework): tx3.wit.vtxinwit[0].scriptWitness.stack = [ witness_program ] # Also check that old_node gets a tx announcement, even though this is # a witness transaction. - self.old_node.wait_for_inv(CInv(1, tx2.sha256)) # wait until tx2 was inv'ed + self.old_node.wait_for_inv([CInv(1, tx2.sha256)]) # wait until tx2 was inv'ed self.test_node.test_transaction_acceptance(tx3, with_witness=True, accepted=True) - self.old_node.wait_for_inv(CInv(1, tx3.sha256)) + self.old_node.wait_for_inv([CInv(1, tx3.sha256)]) # Test that getrawtransaction returns correct witness information # hash, size, vsize diff --git a/test/functional/test_framework/mininode.py b/test/functional/test_framework/mininode.py index 03db0d1092..70bba566c7 100755 --- a/test/functional/test_framework/mininode.py +++ b/test/functional/test_framework/mininode.py @@ -1604,7 +1604,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): |