test: remove race in the user-agent reception check

In `add_p2p_connection()` we connect to `bitcoind` from the Python
client and check that it has received our version string.

This check looked up the last/newest entry from `getpeerinfo` RPC,
assuming that it must be the connection we have just opened. But this
will not be the case if a new inbound or outbound connection is made
to/from `bitcoind` in the meantime.

Instead of the last entry in `getpeerinfo`, check all and find the one
which corresponds to our connection using our outgoing address:port
tuple which is unique.

Co-authored-by: MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz>
Co-authored-by: Jon Atack <jon@atack.com>
pull/27986/head
Vasil Dimov 1 year ago
parent d9c7c2fd3e
commit 20b49460b3
No known key found for this signature in database
GPG Key ID: 54DF06F64B55CBBF

@ -633,10 +633,13 @@ class TestNode():
# in comparison to the upside of making tests less fragile and unexpected intermittent errors less likely. # in comparison to the upside of making tests less fragile and unexpected intermittent errors less likely.
p2p_conn.sync_with_ping() p2p_conn.sync_with_ping()
# Consistency check that the Bitcoin Core has received our user agent string. This checks the # Consistency check that the node received our user agent string.
# node's newest peer. It could be racy if another Bitcoin Core node has connected since we opened # Find our connection in getpeerinfo by our address:port, as it is unique.
# our connection, but we don't expect that to happen. sockname = p2p_conn._transport.get_extra_info("socket").getsockname()
assert_equal(self.getpeerinfo()[-1]['subver'], P2P_SUBVERSION) our_addr_and_port = f"{sockname[0]}:{sockname[1]}"
info = [peer for peer in self.getpeerinfo() if peer["addr"] == our_addr_and_port]
assert_equal(len(info), 1)
assert_equal(info[0]["subver"], P2P_SUBVERSION)
return p2p_conn return p2p_conn

Loading…
Cancel
Save