diff --git a/test/functional/disconnect_ban.py b/test/functional/disconnect_ban.py --- a/test/functional/disconnect_ban.py +++ b/test/functional/disconnect_ban.py @@ -1,31 +1,31 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2016 The Bitcoin Core developers +# Copyright (c) 2014-2017 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test node disconnect and ban behavior""" +import time -from test_framework.mininode import wait_until from test_framework.test_framework import BitcoinTestFramework -from test_framework.util import (assert_equal, - assert_raises_jsonrpc, - connect_nodes_bi) +from test_framework.util import ( + assert_equal, + assert_raises_jsonrpc, + connect_nodes_bi, +) +from test_framework.mininode import wait_until class DisconnectBanTest(BitcoinTestFramework): - def __init__(self): super().__init__() self.num_nodes = 2 - self.setup_clean_chain = False def run_test(self): self.log.info("Test setban and listbanned RPCs") - self.log.info("setban: successfully ban single IP address") # node1 should have 2 connections to node0 at this point assert_equal(len(self.nodes[1].getpeerinfo()), 2) self.nodes[1].setban("127.0.0.1", "add") - wait_until(lambda: len(self.nodes[1].getpeerinfo()) == 0) + wait_until(lambda: len(self.nodes[1].getpeerinfo()) == 0, timeout=10) # all nodes must be disconnected at this point assert_equal(len(self.nodes[1].getpeerinfo()), 0) assert_equal(len(self.nodes[1].listbanned()), 1) @@ -37,19 +37,18 @@ self.log.info("setban: fail to ban an already banned subnet") assert_equal(len(self.nodes[1].listbanned()), 1) - assert_raises_jsonrpc( - -23, "IP/Subnet already banned", self.nodes[1].setban, "127.0.0.1", "add") + assert_raises_jsonrpc(-23, "IP/Subnet already banned", + self.nodes[1].setban, "127.0.0.1", "add") self.log.info("setban: fail to ban an invalid subnet") - assert_raises_jsonrpc( - -30, "Error: Invalid IP/Subnet", self.nodes[1].setban, "127.0.0.1/42", "add") - # still only one banned ip because 127.0.0.1 is within the range of - # 127.0.0.0/24 + assert_raises_jsonrpc(-30, "Error: Invalid IP/Subnet", + self.nodes[1].setban, "127.0.0.1/42", "add") + # still only one banned ip because 127.0.0.1 is within the range of 127.0.0.0/24 assert_equal(len(self.nodes[1].listbanned()), 1) self.log.info("setban remove: fail to unban a non-banned subnet") - assert_raises_jsonrpc( - -30, "Error: Unban failed", self.nodes[1].setban, "127.0.0.1", "remove") + assert_raises_jsonrpc(-30, "Error: Unban failed", + self.nodes[1].setban, "127.0.0.1", "remove") assert_equal(len(self.nodes[1].listbanned()), 1) self.log.info("setban remove: successfully unban subnet") @@ -61,19 +60,26 @@ self.log.info("setban: test persistence across node restart") self.nodes[1].setban("127.0.0.0/32", "add") self.nodes[1].setban("127.0.0.0/24", "add") - # ban for 1 seconds - self.nodes[1].setban("192.168.0.1", "add", 1) + # Set the mocktime so we can control when bans expire + old_time = int(time.time()) + self.nodes[1].setmocktime(old_time) + self.nodes[1].setban("192.168.0.1", "add", 1) # ban for 1 seconds # ban for 1000 seconds self.nodes[1].setban( "2001:4d48:ac57:400:cacf:e9ff:fe1d:9c63/19", "add", 1000) listBeforeShutdown = self.nodes[1].listbanned() assert_equal("192.168.0.1/32", listBeforeShutdown[2]['address']) - wait_until(lambda: len(self.nodes[1].listbanned()) == 3) + # Move time forward by 3 seconds so the third ban has expired + self.nodes[1].setmocktime(old_time + 3) + assert_equal(len(self.nodes[1].listbanned()), 3) self.stop_node(1) - + self.log.info("Test disconnectnode RPCs") self.nodes[1] = self.start_node(1, self.options.tmpdir) + listAfterShutdown = self.nodes[1].listbanned() + self.log.info('list') + self.log.info(listAfterShutdown) assert_equal("127.0.0.0/24", listAfterShutdown[0]['address']) assert_equal("127.0.0.0/32", listAfterShutdown[1]['address']) assert_equal("/19" in listAfterShutdown[2]['address'], True) @@ -88,9 +94,8 @@ "disconnectnode: fail to disconnect when calling with address and nodeid") address1 = self.nodes[0].getpeerinfo()[0]['addr'] node1 = self.nodes[0].getpeerinfo()[0]['addr'] - assert_raises_jsonrpc( - -32602, "Only one of address and nodeid should be provided.", - self.nodes[0].disconnectnode, address=address1, nodeid=node1) + assert_raises_jsonrpc(-32602, "Only one of address and nodeid should be provided.", + self.nodes[0].disconnectnode, address=address1, nodeid=node1) self.log.info( "disconnectnode: fail to disconnect when calling with junk address") @@ -101,24 +106,23 @@ "disconnectnode: successfully disconnect node by address") address1 = self.nodes[0].getpeerinfo()[0]['addr'] self.nodes[0].disconnectnode(address=address1) - wait_until(lambda: len(self.nodes[0].getpeerinfo()) == 1) - assert not [node for node in self.nodes[0] - .getpeerinfo() if node['addr'] == address1] + 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] self.log.info("disconnectnode: successfully reconnect node") - # reconnect the node - connect_nodes_bi(self.nodes, 0, 1) + connect_nodes_bi(self.nodes, 0, 1) # reconnect the node assert_equal(len(self.nodes[0].getpeerinfo()), 2) - assert [node for node in self.nodes[0] - .getpeerinfo() if node['addr'] == address1] + assert [node for node in self.nodes[0].getpeerinfo() if node['addr'] + == address1] self.log.info( "disconnectnode: successfully disconnect node by node id") id1 = self.nodes[0].getpeerinfo()[0]['id'] self.nodes[0].disconnectnode(nodeid=id1) - wait_until(lambda: len(self.nodes[0].getpeerinfo()) == 1) - assert not [node for node in self.nodes[ - 0].getpeerinfo() if node['id'] == id1] + wait_until(lambda: len(self.nodes[0].getpeerinfo()) == 1, timeout=10) + assert not [node for node in self.nodes[0].getpeerinfo() + if node['id'] == id1] if __name__ == '__main__':