Skip to content

Commit 5cc3ee2

Browse files
committed
[tests] disconnect_ban: remove dependency on urllib
1 parent 12de2f2 commit 5cc3ee2

File tree

1 file changed

+5
-12
lines changed

1 file changed

+5
-12
lines changed

test/functional/disconnect_ban.py

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,12 @@
33
# Distributed under the MIT software license, see the accompanying
44
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
55
"""Test node disconnect and ban behavior"""
6-
import urllib.parse
76

87
from test_framework.mininode import wait_until
98
from test_framework.test_framework import BitcoinTestFramework
109
from test_framework.util import (assert_equal,
1110
assert_raises_jsonrpc,
1211
connect_nodes_bi,
13-
p2p_port,
1412
start_node,
1513
stop_node,
1614
)
@@ -82,20 +80,15 @@ def run_test(self):
8280

8381
self.log.info("Test disconnectrnode RPCs")
8482

85-
self.log.info("disconnectnode: successfully disconnect node")
86-
url = urllib.parse.urlparse(self.nodes[1].url)
87-
self.nodes[0].disconnectnode(url.hostname + ":" + str(p2p_port(1)))
83+
self.log.info("disconnectnode: successfully disconnect node by address")
84+
address1 = self.nodes[0].getpeerinfo()[0]['addr']
85+
self.nodes[0].disconnectnode(address=address1)
8886
wait_until(lambda: len(self.nodes[0].getpeerinfo()) == 1)
89-
for node in self.nodes[0].getpeerinfo():
90-
assert(node['addr'] != url.hostname + ":" + str(p2p_port(1)))
87+
assert not [node for node in self.nodes[0].getpeerinfo() if node['addr'] == address1]
9188

9289
self.log.info("disconnectnode: successfully reconnect node")
9390
connect_nodes_bi(self.nodes, 0, 1) # reconnect the node
94-
found = False
95-
for node in self.nodes[0].getpeerinfo():
96-
if node['addr'] == url.hostname + ":" + str(p2p_port(1)):
97-
found = True
98-
assert(found)
91+
assert [node for node in self.nodes[0].getpeerinfo() if node['addr'] == address1]
9992

10093
if __name__ == '__main__':
10194
DisconnectBanTest().main()

0 commit comments

Comments
 (0)