diff options
Diffstat (limited to 'test/functional/feature_loadblock.py')
-rwxr-xr-x | test/functional/feature_loadblock.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/test/functional/feature_loadblock.py b/test/functional/feature_loadblock.py index 12d65fde68..5129e0d328 100755 --- a/test/functional/feature_loadblock.py +++ b/test/functional/feature_loadblock.py @@ -10,7 +10,7 @@ To generate that file this test uses the helper scripts available in contrib/linearize. """ -import os +from pathlib import Path import subprocess import sys import tempfile @@ -32,10 +32,10 @@ class LoadblockTest(BitcoinTestFramework): self.generate(self.nodes[0], COINBASE_MATURITY, sync_fun=self.no_op) # Parsing the url of our node to get settings for config file - data_dir = self.nodes[0].datadir + data_dir = self.nodes[0].datadir_path node_url = urllib.parse.urlparse(self.nodes[0].url) - cfg_file = os.path.join(data_dir, "linearize.cfg") - bootstrap_file = os.path.join(self.options.tmpdir, "bootstrap.dat") + cfg_file = data_dir / "linearize.cfg" + bootstrap_file = Path(self.options.tmpdir) / "bootstrap.dat" genesis_block = self.nodes[0].getblockhash(0) blocks_dir = self.nodes[0].blocks_path hash_list = tempfile.NamedTemporaryFile(dir=data_dir, @@ -58,16 +58,16 @@ class LoadblockTest(BitcoinTestFramework): cfg.write(f"hashlist={hash_list.name}\n") base_dir = self.config["environment"]["SRCDIR"] - linearize_dir = os.path.join(base_dir, "contrib", "linearize") + linearize_dir = Path(base_dir) / "contrib" / "linearize" self.log.info("Run linearization of block hashes") - linearize_hashes_file = os.path.join(linearize_dir, "linearize-hashes.py") + linearize_hashes_file = linearize_dir / "linearize-hashes.py" subprocess.run([sys.executable, linearize_hashes_file, cfg_file], stdout=hash_list, check=True) self.log.info("Run linearization of block data") - linearize_data_file = os.path.join(linearize_dir, "linearize-data.py") + linearize_data_file = linearize_dir / "linearize-data.py" subprocess.run([sys.executable, linearize_data_file, cfg_file], check=True) |