aboutsummaryrefslogtreecommitdiff
path: root/qa/rpc-tests
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2016-11-08 10:55:33 +0100
committerWladimir J. van der Laan <laanwj@gmail.com>2016-11-08 10:55:45 +0100
commit71ab476b048273060ef4e2fe16c8beadfe4d582f (patch)
treec7df14f50c273eb50cff00419a872c54c9a31db1 /qa/rpc-tests
parentf53023dbb8609add92497fa7b296ba48304d905a (diff)
parentfab0f07dec8d6e21ab70843fdce101f1703588fd (diff)
downloadbitcoin-71ab476b048273060ef4e2fe16c8beadfe4d582f.tar.xz
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)
Diffstat (limited to 'qa/rpc-tests')
-rwxr-xr-xqa/rpc-tests/test_framework/test_framework.py7
1 files changed, 1 insertions, 6 deletions
diff --git a/qa/rpc-tests/test_framework/test_framework.py b/qa/rpc-tests/test_framework/test_framework.py
index e6fc5fd8a2..e6d3e9ab9a 100755
--- a/qa/rpc-tests/test_framework/test_framework.py
+++ b/qa/rpc-tests/test_framework/test_framework.py
@@ -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])