aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2017-10-10 00:04:45 +0200
committerMarcoFalke <falke.marco@gmail.com>2017-11-01 15:23:06 -0400
commitf3457d0e83c408770eeabb002f569e22c9832c1b (patch)
tree6e653cb243fadda7665928ca1e0364212fd04a06
parent9c8006dc332139069d798f39406ec67186ecb311 (diff)
downloadbitcoin-f3457d0e83c408770eeabb002f569e22c9832c1b.tar.xz
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. Github-Pull: #11472 Rebased-From: fa9de370b17297d6dd542da627c8dd2b31aec340
-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 a53eb51799..7aabdd9c00 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")