Skip to content

Commit 508eb25

Browse files
vasildjonatack
andcommitted
test: remove default argument of feature_proxy.py:node_test()
The default bool argument makes it harder to read because the last but one argument is also bool. Pass all of them as named arguments to increase readability. Another bool argument will be added to indicate whether to test CJDNS. Co-authored-by: Jon Atack <[email protected]>
1 parent 6387f39 commit 508eb25

File tree

1 file changed

+13
-5
lines changed

1 file changed

+13
-5
lines changed

test/functional/feature_proxy.py

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ def network_test(self, node, addr, network):
114114
if peer["addr"] == addr:
115115
assert_equal(peer["network"], network)
116116

117-
def node_test(self, node, proxies, auth, test_onion=True):
117+
def node_test(self, node, *, proxies, auth, test_onion):
118118
rv = []
119119
addr = "15.61.23.23:1234"
120120
self.log.debug(f"Test: outgoing IPv4 connection through node for address {addr}")
@@ -180,20 +180,28 @@ def node_test(self, node, proxies, auth, test_onion=True):
180180

181181
def run_test(self):
182182
# basic -proxy
183-
self.node_test(self.nodes[0], [self.serv1, self.serv1, self.serv1, self.serv1], False)
183+
self.node_test(self.nodes[0],
184+
proxies=[self.serv1, self.serv1, self.serv1, self.serv1],
185+
auth=False, test_onion=True)
184186

185187
# -proxy plus -onion
186-
self.node_test(self.nodes[1], [self.serv1, self.serv1, self.serv2, self.serv1], False)
188+
self.node_test(self.nodes[1],
189+
proxies=[self.serv1, self.serv1, self.serv2, self.serv1],
190+
auth=False, test_onion=True)
187191

188192
# -proxy plus -onion, -proxyrandomize
189-
rv = self.node_test(self.nodes[2], [self.serv2, self.serv2, self.serv2, self.serv2], True)
193+
rv = self.node_test(self.nodes[2],
194+
proxies=[self.serv2, self.serv2, self.serv2, self.serv2],
195+
auth=True, test_onion=True)
190196
# Check that credentials as used for -proxyrandomize connections are unique
191197
credentials = set((x.username,x.password) for x in rv)
192198
assert_equal(len(credentials), len(rv))
193199

194200
if self.have_ipv6:
195201
# proxy on IPv6 localhost
196-
self.node_test(self.nodes[3], [self.serv3, self.serv3, self.serv3, self.serv3], False, False)
202+
self.node_test(self.nodes[3],
203+
proxies=[self.serv3, self.serv3, self.serv3, self.serv3],
204+
auth=False, test_onion=False)
197205

198206
def networks_dict(d):
199207
r = {}

0 commit comments

Comments
 (0)