Merge #9098: [qa] Handle zombies and cluttered tmpdirs
fab0f07
[qa] rpc-tests: Apply random offset to portseed (MarcoFalke)fae19aa
[qa] test_framework: Exit when tmpdir exists (MarcoFalke)
This commit is contained in:
commit
71ab476b04
2 changed files with 6 additions and 7 deletions
|
@ -246,6 +246,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):
|
||||
|
@ -253,7 +257,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,
|
||||
|
|
|
@ -139,16 +139,11 @@ class BitcoinTestFramework(object):
|
|||
|
||||
success = False
|
||||
try:
|
||||
if not os.path.isdir(self.options.tmpdir):
|
||||
os.makedirs(self.options.tmpdir)
|
||||
os.makedirs(self.options.tmpdir, exist_ok=False)
|
||||
self.setup_chain()
|
||||
|
||||
self.setup_network()
|
||||
|
||||
self.run_test()
|
||||
|
||||
success = True
|
||||
|
||||
except JSONRPCException as e:
|
||||
print("JSONRPC error: "+e.error['message'])
|
||||
traceback.print_tb(sys.exc_info()[2])
|
||||
|
|
Loading…
Reference in a new issue