Skip to content

Commit 04d63fb

Browse files
committed
Merge bitcoin/bitcoin#30374: Revert "test: p2p: check that connecting to ourself leads to disconnect"
9ec2c53 Revert "test: p2p: check that connecting to ourself leads to disconnect" (Sebastian Falbesoner) Pull request description: As suggested in bitcoin/bitcoin#30368 (comment), this PR reverts the recently added test #30362 that causes frequent CI failures. A TODO is added in the functional test file to re-add it later when the race condition is fixed. ACKs for top commit: mzumsande: utACK 9ec2c53 brunoerg: utACK 9ec2c53 tdb3: ACK 9ec2c53 Tree-SHA512: df211ab194dc47f2ff8192f3827382974db922ed9fa54bc44fac75de4edfb3af43c1340cd5434b15b0b573f7b0ddd4451a0bbbbd7deaf7f4244e4865b9d5977e
2 parents fe70be5 + 9ec2c53 commit 04d63fb

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

test/functional/p2p_handshake.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
NODE_WITNESS,
1818
)
1919
from test_framework.p2p import P2PInterface
20-
from test_framework.util import p2p_port
2120

2221

2322
# Desirable service flags for outbound non-pruned and pruned peers. Note that
@@ -89,11 +88,9 @@ def run_test(self):
8988
with node.assert_debug_log([f"feeler connection completed"]):
9089
self.add_outbound_connection(node, "feeler", NODE_NONE, wait_for_disconnect=True)
9190

92-
self.log.info("Check that connecting to ourself leads to immediate disconnect")
93-
with node.assert_debug_log(["connected to self", "disconnecting"]):
94-
node_listen_addr = f"127.0.0.1:{p2p_port(0)}"
95-
node.addconnection(node_listen_addr, "outbound-full-relay", self.options.v2transport)
96-
self.wait_until(lambda: len(node.getpeerinfo()) == 0)
91+
# TODO: re-add test introduced in commit 5d2fb14bafe4e80c0a482d99e5ebde07c477f000
92+
# ("test: p2p: check that connecting to ourself leads to disconnect") once
93+
# the race condition causing issue #30368 is fixed
9794

9895

9996
if __name__ == '__main__':

0 commit comments

Comments
 (0)