diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-06-11 14:33:34 +0200 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-06-11 14:38:32 +0200 |
commit | 531a0337ca93425d123afca6506055163545f3e2 (patch) | |
tree | feac0630f0081b92ba56ae6c229cd635f006e787 | |
parent | 6e249e46789fc2408d00fc520940b879156bd2e8 (diff) | |
parent | fa6edfef358518022ee86c0abc77c1c068f106a3 (diff) | |
download | bitcoin-531a0337ca93425d123afca6506055163545f3e2.tar.xz |
Merge #13421: qa: Remove portseed_offset from test runner
fa6edfef358518022ee86c0abc77c1c068f106a3 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
-rwxr-xr-x | test/functional/test_runner.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py index 65e4c0817e..5b3a4df0f9 100755 --- a/test/functional/test_runner.py +++ b/test/functional/test_runner.py @@ -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) |