Merge #13421: qa: Remove portseed_offset from test runner
fa6edfef35
qa: Remove portseed_offset from test runner (MarcoFalke)
Pull request description:
The portseed_offset is no longer needed in the test runner, since we already kill leftover processes (see #12904). This "fixes" #10869 because we deterministically pick ports starting at 11000
Tree-SHA512: 1ee22e19e02acd3afadc7c6a2b391fd3b5cfcec22c0fe194f3207251e7b1264a04e47d90a3ff8be4aca7d0ec33219a2f5855076acb3565291767939bc2f2fa17
This commit is contained in:
commit
531a0337ca
1 changed files with 1 additions and 5 deletions
|
@ -419,10 +419,6 @@ class TestHandler:
|
|||
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):
|
||||
|
@ -430,7 +426,7 @@ class TestHandler:
|
|||
# Add tests
|
||||
self.num_running += 1
|
||||
test = self.test_list.pop(0)
|
||||
portseed = len(self.test_list) + self.portseed_offset
|
||||
portseed = len(self.test_list)
|
||||
portseed_arg = ["--portseed={}".format(portseed)]
|
||||
log_stdout = tempfile.SpooledTemporaryFile(max_size=2**16)
|
||||
log_stderr = tempfile.SpooledTemporaryFile(max_size=2**16)
|
||||
|
|
Loading…
Reference in a new issue