[tests] update disconnect_ban.py test case to work with listbanned

Github-Pull: #10234
Rebased-From: d6732d832a
This commit is contained in:
John Newbery 2017-04-25 10:11:31 -04:00 committed by Luke Dashjr
parent d289b564e3
commit ee1a60d156

View file

@ -33,7 +33,7 @@ class NodeHandlingTest(BitcoinTestFramework):
###########################
assert_equal(len(self.nodes[1].getpeerinfo()), 2) # node1 should have 2 connections to node0 at this point
self.nodes[1].setban("127.0.0.1", "add")
wait_until(lambda: len(self.nodes[1].getpeerinfo()) == 0)
assert wait_until(lambda: len(self.nodes[1].getpeerinfo()) == 0, timeout=10)
assert_equal(len(self.nodes[1].getpeerinfo()), 0) # all nodes must be disconnected at this point
assert_equal(len(self.nodes[1].listbanned()), 1)
self.nodes[1].clearbanned()
@ -60,7 +60,7 @@ class NodeHandlingTest(BitcoinTestFramework):
self.nodes[1].setban("2001:4d48:ac57:400:cacf:e9ff:fe1d:9c63/19", "add", 1000) # ban for 1000 seconds
listBeforeShutdown = self.nodes[1].listbanned()
assert_equal("192.168.0.1/32", listBeforeShutdown[2]['address'])
wait_until(lambda: len(self.nodes[1].listbanned()) == 3)
assert wait_until(lambda: len(self.nodes[1].listbanned()) == 3, timeout=10)
stop_node(self.nodes[1], 1)
@ -79,7 +79,7 @@ class NodeHandlingTest(BitcoinTestFramework):
###########################
address1 = self.nodes[0].getpeerinfo()[0]['addr']
self.nodes[0].disconnectnode(address=address1)
wait_until(lambda: len(self.nodes[0].getpeerinfo()) == 1)
assert wait_until(lambda: len(self.nodes[0].getpeerinfo()) == 1, timeout=10)
assert not [node for node in self.nodes[0].getpeerinfo() if node['addr'] == address1]
connect_nodes_bi(self.nodes, 0, 1) # reconnect the node