From fd0bde2793239bd6d60a2435fa28df915cedd7e6 Mon Sep 17 00:00:00 2001 From: Sebastian Falbesoner Date: Fri, 8 Dec 2023 18:23:01 +0100 Subject: [PATCH] test: fix `addnode` functional test failure on OpenBSD This is the functional test counterpart of PR #28891 / commit 007d6f0e85bc329040bb405ef6016339518caa66. --- test/functional/rpc_net.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/test/functional/rpc_net.py b/test/functional/rpc_net.py index b193ffd4625..83dd8bc5cd0 100755 --- a/test/functional/rpc_net.py +++ b/test/functional/rpc_net.py @@ -9,6 +9,7 @@ Tests correspond to code in rpc/net.cpp. from decimal import Decimal from itertools import product +import platform import time import test_framework.messages @@ -220,8 +221,10 @@ class NetTest(BitcoinTestFramework): ip_port = "127.0.0.1:{}".format(p2p_port(2)) self.nodes[0].addnode(node=ip_port, command='add') # try to add an equivalent ip - ip_port2 = "127.1:{}".format(p2p_port(2)) - assert_raises_rpc_error(-23, "Node already added", self.nodes[0].addnode, node=ip_port2, command='add') + # (note that OpenBSD doesn't support the IPv4 shorthand notation with omitted zero-bytes) + if platform.system() != "OpenBSD": + ip_port2 = "127.1:{}".format(p2p_port(2)) + assert_raises_rpc_error(-23, "Node already added", self.nodes[0].addnode, node=ip_port2, command='add') # check that the node has indeed been added added_nodes = self.nodes[0].getaddednodeinfo() assert_equal(len(added_nodes), 1)