mirror of
https://github.com/dashpay/dash.git
synced 2024-12-25 12:02:48 +01:00
b07a7b810c
* Merge #11796: [tests] Functional test naming convention5fecd84[tests] Remove redundant import in blocktools.py test (Anthony Towns)9b20bb4[tests] Check tests conform to naming convention (Anthony Towns)7250b4e[tests] README.md nit fixes (Anthony Towns)82b2712[tests] move witness util functions to blocktools.py (John Newbery)1e10854[tests] [docs] update README for new test naming scheme (John Newbery) Pull request description: Splitting #11774 into two parts -- this part updates the README with the proposed naming convention, and adds some checks to test_runner.py that the number of tests violating the naming convention doesn't increase too much. Idea is this part of the change should not introduce merge conflicts or require much rebasing, so reviews of the complicated bits won't become invalidated too often; while the second part will just be file renames, which will require regular rebasing and will introduce merge conflicts with pending PRs, but can be merged later, and should also be much easier to review, since it will only include relatively trivial changes. Tree-SHA512: b96557d41714addbbfe2aed62fb5a48639eaeb1eb3aba30ac1b3a86bb3cb8d796c6247f9c414c4695c4bf54c0ec9968ac88e2f88fb62483bc1a2f89368f7fc80 * update violation count Signed-off-by: pasta <pasta@dashboost.org> * Merge #11774: [tests] Rename functional tests6f881cc880[tests] Remove EXPECTED_VIOLATION_COUNT (Anthony Towns)3150b3fea7[tests] Rename misc functional tests. (Anthony Towns)81b79f2c39[tests] Rename rpc_* functional tests. (Anthony Towns)61b8f7f273[tests] Rename p2p_* functional tests. (Anthony Towns)90600bc7db[tests] Rename wallet_* functional tests. (Anthony Towns)ca6523d0c8[tests] Rename feature_* functional tests. (Anthony Towns) Pull request description: This PR changes the functional tests to have a consistent naming scheme: tests for individual RPC methods are named rpc_... tests for interfaces (REST, ZMQ, RPC features) are named interface_... tests that explicitly test the p2p interface are named p2p_... tests for wallet features are named wallet_... tests for mining features are named mining_... tests for mempool behaviour are named mempool_... tests for full features that aren't wallet/mining/mempool are named feature_... Rationale: it's sometimes difficult for new contributors to know what's already covered by existing tests and where new tests should be added. Naming in a consistent fashion makes it easier to see what's already covered at a glance. Tree-SHA512: 4246790552d42bbd95f6d5bdf67702b81b3b2c583ce7eaf1fe6d8e254721279b47315973c6e9ae82dad6e4c747f12188160764bf2624c0f8f3b4d39330ec8b16 * rename tests and edit associated strings to align test-suite with test name standards Signed-off-by: pasta <pasta@dashboost.org> * fix grammar in test/functional/test_runner.py Co-authored-by: dustinface <35775977+xdustinface@users.noreply.github.com> * ci: Fix excluded test names * rename feature_privatesend.py to rpc_privatesend.py Signed-off-by: pasta <pasta@dashboost.org> Co-authored-by: Wladimir J. van der Laan <laanwj@gmail.com> Co-authored-by: MarcoFalke <falke.marco@gmail.com> Co-authored-by: dustinface <35775977+xdustinface@users.noreply.github.com> Co-authored-by: xdustinface <xdustinfacex@gmail.com>
103 lines
5.0 KiB
Python
Executable File
103 lines
5.0 KiB
Python
Executable File
#!/usr/bin/env python3
|
|
# Copyright (c) 2014-2016 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"""
|
|
|
|
from test_framework.test_framework import BitcoinTestFramework
|
|
from test_framework.util import (
|
|
assert_equal,
|
|
assert_raises_rpc_error,
|
|
connect_nodes_bi,
|
|
wait_until,
|
|
)
|
|
|
|
class DisconnectBanTest(BitcoinTestFramework):
|
|
def set_test_params(self):
|
|
self.num_nodes = 2
|
|
|
|
def run_test(self):
|
|
self.log.info("Test setban and listbanned RPCs")
|
|
|
|
self.log.info("setban: successfully ban single IP address")
|
|
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, 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.log.info("clearbanned: successfully clear ban list")
|
|
self.nodes[1].clearbanned()
|
|
assert_equal(len(self.nodes[1].listbanned()), 0)
|
|
self.nodes[1].setban("127.0.0.0/24", "add")
|
|
|
|
self.log.info("setban: fail to ban an already banned subnet")
|
|
assert_equal(len(self.nodes[1].listbanned()), 1)
|
|
assert_raises_rpc_error(-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_rpc_error(-30, "Error: Invalid IP/Subnet", self.nodes[1].setban, "127.0.0.1/42", "add")
|
|
assert_equal(len(self.nodes[1].listbanned()), 1) # still only one banned ip because 127.0.0.1 is within the range of 127.0.0.0/24
|
|
|
|
self.log.info("setban remove: fail to unban a non-banned subnet")
|
|
assert_raises_rpc_error(-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")
|
|
self.nodes[1].setban("127.0.0.0/24", "remove")
|
|
assert_equal(len(self.nodes[1].listbanned()), 0)
|
|
self.nodes[1].clearbanned()
|
|
assert_equal(len(self.nodes[1].listbanned()), 0)
|
|
|
|
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")
|
|
self.nodes[1].setban("192.168.0.1", "add", 1) # ban for 1 seconds
|
|
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'])
|
|
self.bump_mocktime(2)
|
|
wait_until(lambda: len(self.nodes[1].listbanned()) == 3, timeout=10)
|
|
|
|
self.stop_node(1)
|
|
self.start_node(1)
|
|
|
|
listAfterShutdown = self.nodes[1].listbanned()
|
|
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)
|
|
|
|
# Clear ban lists
|
|
self.nodes[1].clearbanned()
|
|
connect_nodes_bi(self.nodes, 0, 1)
|
|
|
|
self.log.info("Test disconnectnode RPCs")
|
|
|
|
self.log.info("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_rpc_error(-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")
|
|
assert_raises_rpc_error(-29, "Node not found in connected nodes", self.nodes[0].disconnectnode, address="221B Baker Street")
|
|
|
|
self.log.info("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, timeout=10)
|
|
assert not [node for node in self.nodes[0].getpeerinfo() if node['addr'] == address1]
|
|
|
|
self.log.info("disconnectnode: successfully reconnect node")
|
|
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]
|
|
|
|
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, timeout=10)
|
|
assert not [node for node in self.nodes[0].getpeerinfo() if node['id'] == id1]
|
|
|
|
if __name__ == '__main__':
|
|
DisconnectBanTest().main()
|