Skip to content

Commit fab0f07

Browse files
author
MarcoFalke
committed
[qa] rpc-tests: Apply random offset to portseed
This helps to skip over resources, which are blocked by regtest bitcoind zombie nodes
1 parent fae19aa commit fab0f07

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

qa/pull-tester/rpc-tests.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,14 +246,18 @@ def __init__(self, num_tests_parallel, test_list=None, flags=None):
246246
self.test_list = test_list
247247
self.flags = flags
248248
self.num_running = 0
249+
# In case there is a graveyard of zombie bitcoinds, we can apply a
250+
# pseudorandom offset to hopefully jump over them.
251+
# (625 is PORT_RANGE/MAX_NODES)
252+
self.portseed_offset = int(time.time() * 1000) % 625
249253
self.jobs = []
250254

251255
def get_next(self):
252256
while self.num_running < self.num_jobs and self.test_list:
253257
# Add tests
254258
self.num_running += 1
255259
t = self.test_list.pop(0)
256-
port_seed = ["--portseed=%s" % len(self.test_list)]
260+
port_seed = ["--portseed={}".format(len(self.test_list) + self.portseed_offset)]
257261
log_stdout = tempfile.SpooledTemporaryFile(max_size=2**16)
258262
log_stderr = tempfile.SpooledTemporaryFile(max_size=2**16)
259263
self.jobs.append((t,

0 commit comments

Comments
 (0)