[qa] rpc-tests: Apply random offset to portseed

This helps to skip over resources, which are blocked by regtest bitcoind
zombie nodes
This commit is contained in:
MarcoFalke 2016-11-07 22:33:22 +01:00
parent fae19aa1da
commit fab0f07dec

View File

@ -246,6 +246,10 @@ class RPCTestHandler:
self.test_list = test_list self.test_list = test_list
self.flags = flags self.flags = flags
self.num_running = 0 self.num_running = 0
# In case there is a graveyard of zombie bitcoinds, we can apply a
# pseudorandom offset to hopefully jump over them.
# (625 is PORT_RANGE/MAX_NODES)
self.portseed_offset = int(time.time() * 1000) % 625
self.jobs = [] self.jobs = []
def get_next(self): def get_next(self):
@ -253,7 +257,7 @@ class RPCTestHandler:
# Add tests # Add tests
self.num_running += 1 self.num_running += 1
t = self.test_list.pop(0) t = self.test_list.pop(0)
port_seed = ["--portseed=%s" % len(self.test_list)] port_seed = ["--portseed={}".format(len(self.test_list) + self.portseed_offset)]
log_stdout = tempfile.SpooledTemporaryFile(max_size=2**16) log_stdout = tempfile.SpooledTemporaryFile(max_size=2**16)
log_stderr = tempfile.SpooledTemporaryFile(max_size=2**16) log_stderr = tempfile.SpooledTemporaryFile(max_size=2**16)
self.jobs.append((t, self.jobs.append((t,