diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2016-11-07 22:33:22 +0100 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2016-12-02 07:58:23 +0000 |
| commit | 58eab244fb9514b74e157b5dde9060cc8f3b77a8 (patch) | |
| tree | ec6f81a55cab23f9f461e235dc1cfa2a0f88ba30 | |
| parent | ecd7db57672d4f2dbc85ac03e571b795b0259298 (diff) | |
| download | bitcoin-58eab244fb9514b74e157b5dde9060cc8f3b77a8.tar.xz | |
[qa] rpc-tests: Apply random offset to portseed
This helps to skip over resources, which are blocked by regtest bitcoind
zombie nodes
Github-Pull: #9098
Rebased-From: fab0f07dec8d6e21ab70843fdce101f1703588fd
| -rwxr-xr-x | qa/pull-tester/rpc-tests.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py index dbd6de5599..887644c51b 100755 --- a/qa/pull-tester/rpc-tests.py +++ b/qa/pull-tester/rpc-tests.py @@ -243,6 +243,10 @@ class RPCTestHandler: self.test_list = test_list self.flags = flags 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 = [] def get_next(self): @@ -250,7 +254,7 @@ class RPCTestHandler: # Add tests self.num_running += 1 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_stderr = tempfile.SpooledTemporaryFile(max_size=2**16) self.jobs.append((t, |