highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-03-24 14:40:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

[tests] disconnect_ban: remove dependency on urllib

Browse Source 
Github-Pull: #10143
Rebased-From: 5cc3ee24d2
This commit is contained in:
John Newbery
2017-04-19 13:35:51 -04:00
committed by Luke Dashjr
parent 98bd0c338b
commit 04226938a3
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
qa/rpc-tests/nodehandling.py
View File

@@ -6,14 +6,12 @@
# #
# Test node handling # Test node handling
# #
import urllib.parse
from test_framework.mininode import wait_until from test_framework.mininode import wait_until
from test_framework.test_framework import BitcoinTestFramework from test_framework.test_framework import BitcoinTestFramework
from test_framework.util import (assert_equal, from test_framework.util import (assert_equal,
assert_raises_jsonrpc, assert_raises_jsonrpc,
connect_nodes_bi, connect_nodes_bi,
p2p_port,
start_node, start_node,
stop_node, stop_node,
) )
@@ -79,18 +77,13 @@ class NodeHandlingTest(BitcoinTestFramework):
########################### ###########################
# RPC disconnectnode test # # RPC disconnectnode test #
########################### ###########################
url = urllib.parse.urlparse(self.nodes[1].url) address1 = self.nodes[0].getpeerinfo()[0]['addr']
self.nodes[0].disconnectnode(url.hostname + ":" + str(p2p_port(1))) self.nodes[0].disconnectnode(address=address1)
wait_until(lambda: len(self.nodes[0].getpeerinfo()) == 1) wait_until(lambda: len(self.nodes[0].getpeerinfo()) == 1)
for node in self.nodes[0].getpeerinfo(): assert not [node for node in self.nodes[0].getpeerinfo() if node['addr'] == address1]
assert(node['addr'] != url.hostname + ":" + str(p2p_port(1)))
connect_nodes_bi(self.nodes, 0, 1) # reconnect the node connect_nodes_bi(self.nodes, 0, 1) # reconnect the node
found = False assert [node for node in self.nodes[0].getpeerinfo() if node['addr'] == address1]
for node in self.nodes[0].getpeerinfo():
if node['addr'] == url.hostname + ":" + str(p2p_port(1)):
found = True
assert(found)
if __name__ == '__main__': if __name__ == '__main__':
NodeHandlingTest().main() NodeHandlingTest().main()