highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-12-01 16:31:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

test: rpc_net.py logging and test naming improvements

Browse Source
This commit is contained in:
Jon Atack
2020-08-15 09:15:19 +02:00
parent 21c57bacda
commit cfef5a2c98
1 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
test/functional/rpc_net.py
View File

@@ -51,25 +51,27 @@ class NetTest(BitcoinTestFramework):
self.supports_cli = False self.supports_cli = False
def run_test(self): def run_test(self):
self.log.info('Get out of IBD for the minfeefilter and getpeerinfo tests') # Get out of IBD for the minfeefilter and getpeerinfo tests.
self.nodes[0].generate(101) self.nodes[0].generate(101)
self.log.info('Connect nodes both way') # Connect nodes both ways.
connect_nodes(self.nodes[0], 1) connect_nodes(self.nodes[0], 1)
connect_nodes(self.nodes[1], 0) connect_nodes(self.nodes[1], 0)
self._test_connection_count() self.test_connection_count()
self._test_getpeerinfo() self.test_getpeerinfo()
self._test_getnettotals() self.test_getnettotals()
self._test_getnetworkinfo() self.test_getnetworkinfo()
self._test_getaddednodeinfo() self.test_getaddednodeinfo()
self.test_service_flags() self.test_service_flags()
self._test_getnodeaddresses() self.test_getnodeaddresses()
def _test_connection_count(self): def test_connection_count(self):
# connect_nodes connects each node to the other self.log.info("Test getconnectioncount")
# After using `connect_nodes` to connect nodes 0 and 1 to each other.
assert_equal(self.nodes[0].getconnectioncount(), 2) assert_equal(self.nodes[0].getconnectioncount(), 2)
def _test_getnettotals(self): def test_getnettotals(self):
self.log.info("Test getnettotals")
# getnettotals totalbytesrecv and totalbytessent should be # getnettotals totalbytesrecv and totalbytessent should be
# consistent with getpeerinfo. Since the RPC calls are not atomic, # consistent with getpeerinfo. Since the RPC calls are not atomic,
# and messages might have been recvd or sent between RPC calls, call # and messages might have been recvd or sent between RPC calls, call
@@ -99,7 +101,8 @@ class NetTest(BitcoinTestFramework):
assert_greater_than_or_equal(after['bytesrecv_per_msg'].get('pong', 0), before['bytesrecv_per_msg'].get('pong', 0) + 32) assert_greater_than_or_equal(after['bytesrecv_per_msg'].get('pong', 0), before['bytesrecv_per_msg'].get('pong', 0) + 32)
assert_greater_than_or_equal(after['bytessent_per_msg'].get('ping', 0), before['bytessent_per_msg'].get('ping', 0) + 32) assert_greater_than_or_equal(after['bytessent_per_msg'].get('ping', 0), before['bytessent_per_msg'].get('ping', 0) + 32)
def _test_getnetworkinfo(self): def test_getnetworkinfo(self):
self.log.info("Test getnetworkinfo")
assert_equal(self.nodes[0].getnetworkinfo()['networkactive'], True) assert_equal(self.nodes[0].getnetworkinfo()['networkactive'], True)
assert_equal(self.nodes[0].getnetworkinfo()['connections'], 2) assert_equal(self.nodes[0].getnetworkinfo()['connections'], 2)
@@ -111,7 +114,7 @@ class NetTest(BitcoinTestFramework):
with self.nodes[0].assert_debug_log(expected_msgs=['SetNetworkActive: true\n']): with self.nodes[0].assert_debug_log(expected_msgs=['SetNetworkActive: true\n']):
self.nodes[0].setnetworkactive(state=True) self.nodes[0].setnetworkactive(state=True)
self.log.info('Connect nodes both way') # Connect nodes both ways.
connect_nodes(self.nodes[0], 1) connect_nodes(self.nodes[0], 1)
connect_nodes(self.nodes[1], 0) connect_nodes(self.nodes[1], 0)
@@ -123,7 +126,8 @@ class NetTest(BitcoinTestFramework):
for info in network_info: for info in network_info:
assert_net_servicesnames(int(info["localservices"], 0x10), info["localservicesnames"]) assert_net_servicesnames(int(info["localservices"], 0x10), info["localservicesnames"])
def _test_getaddednodeinfo(self): def test_getaddednodeinfo(self):
self.log.info("Test getaddednodeinfo")
assert_equal(self.nodes[0].getaddednodeinfo(), []) assert_equal(self.nodes[0].getaddednodeinfo(), [])
# add a node (node2) to node0 # add a node (node2) to node0
ip_port = "127.0.0.1:{}".format(p2p_port(2)) ip_port = "127.0.0.1:{}".format(p2p_port(2))
@@ -142,7 +146,8 @@ class NetTest(BitcoinTestFramework):
# check that a non-existent node returns an error # check that a non-existent node returns an error
assert_raises_rpc_error(-24, "Node has not been added", self.nodes[0].getaddednodeinfo, '1.1.1.1') assert_raises_rpc_error(-24, "Node has not been added", self.nodes[0].getaddednodeinfo, '1.1.1.1')
def _test_getpeerinfo(self): def test_getpeerinfo(self):
self.log.info("Test getpeerinfo")
# Create a few getpeerinfo last_block/last_transaction values. # Create a few getpeerinfo last_block/last_transaction values.
if self.is_wallet_compiled(): if self.is_wallet_compiled():
self.nodes[0].sendtoaddress(self.nodes[1].getnewaddress(), 1) self.nodes[0].sendtoaddress(self.nodes[1].getnewaddress(), 1)
@@ -166,11 +171,13 @@ class NetTest(BitcoinTestFramework):
assert_net_servicesnames(int(info[0]["services"], 0x10), info[0]["servicesnames"]) assert_net_servicesnames(int(info[0]["services"], 0x10), info[0]["servicesnames"])
def test_service_flags(self): def test_service_flags(self):
self.log.info("Test service flags")
self.nodes[0].add_p2p_connection(P2PInterface(), services=(1 << 4) | (1 << 63)) self.nodes[0].add_p2p_connection(P2PInterface(), services=(1 << 4) | (1 << 63))
assert_equal(['UNKNOWN[2^4]', 'UNKNOWN[2^63]'], self.nodes[0].getpeerinfo()[-1]['servicesnames']) assert_equal(['UNKNOWN[2^4]', 'UNKNOWN[2^63]'], self.nodes[0].getpeerinfo()[-1]['servicesnames'])
self.nodes[0].disconnect_p2ps() self.nodes[0].disconnect_p2ps()
def _test_getnodeaddresses(self): def test_getnodeaddresses(self):
self.log.info("Test getnodeaddresses")
self.nodes[0].add_p2p_connection(P2PInterface()) self.nodes[0].add_p2p_connection(P2PInterface())
# Add some addresses to the Address Manager over RPC. Due to the way # Add some addresses to the Address Manager over RPC. Due to the way