aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcoFalke <[email protected]>2017-10-10 00:04:45 +0200
committerMarcoFalke <[email protected]>2017-10-13 15:28:56 +0200
commitfa9de370b17297d6dd542da627c8dd2b31aec340 (patch)
tree30f1801e9f639622fdc6d7ab62d669880c87e30a
parentMerge #11367: [rpc] getblockchaininfo: add size_on_disk, prune_target_size (diff)
downloaddiscoin-fa9de370b17297d6dd542da627c8dd2b31aec340.tar.xz
discoin-fa9de370b17297d6dd542da627c8dd2b31aec340.zip
qa: Make tmpdir option an absolute path
This should fix issues with the multiwallet test and symlinks when the tmpdir is a relative path. Rather than fixing os.symlink to work with paths relative to a directory descriptor, which does not work on Windows, normalize the path instead.
-rwxr-xr-xtest/functional/test_framework/test_framework.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/test/functional/test_framework/test_framework.py b/test/functional/test_framework/test_framework.py
index 381513ab9..0e843ee67 100755
--- a/test/functional/test_framework/test_framework.py
+++ b/test/functional/test_framework/test_framework.py
@@ -102,8 +102,11 @@ class BitcoinTestFramework(object):
check_json_precision()
+ self.options.cachedir = os.path.abspath(self.options.cachedir)
+
# Set up temp directory and start logging
if self.options.tmpdir:
+ self.options.tmpdir = os.path.abspath(self.options.tmpdir)
os.makedirs(self.options.tmpdir, exist_ok=False)
else:
self.options.tmpdir = tempfile.mkdtemp(prefix="test")