Skip to content

Commit 18606eb

Browse files
committed
Merge #12806: qa: Fix function names in feature_blocksdir
d71bedb qa: Fix function names in feature_blocksdir (MarcoFalke) Pull request description: This fixes the test failure on master: ``` AttributeError: 'BlocksdirTest' object has no attribute 'assert_start_raises_init_error' ``` Tree-SHA512: d96a9b707a9b4fb8752b15f28dae02c60c25cbec21dca5f3ee62e2717c6a49951533c24b52ed0d6e99c5a964ef2c3e90fdc58a9104122714ae9874e121955df6
2 parents ac898b6 + d71bedb commit 18606eb

File tree

1 file changed

+12
-9
lines changed

1 file changed

+12
-9
lines changed

test/functional/feature_blocksdir.py

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@
55
"""Test the blocksdir option.
66
"""
77

8+
import os
9+
import re
10+
import shutil
11+
812
from test_framework.test_framework import BitcoinTestFramework, initialize_datadir
913

10-
import shutil
11-
import os
1214

1315
class BlocksdirTest(BitcoinTestFramework):
1416
def set_test_params(self):
@@ -17,18 +19,19 @@ def set_test_params(self):
1719

1820
def run_test(self):
1921
self.stop_node(0)
20-
node0path = os.path.join(self.options.tmpdir, "node0")
21-
shutil.rmtree(node0path)
22+
shutil.rmtree(self.nodes[0].datadir)
2223
initialize_datadir(self.options.tmpdir, 0)
2324
self.log.info("Starting with non exiting blocksdir ...")
24-
self.assert_start_raises_init_error(0, ["-blocksdir="+self.options.tmpdir+ "/blocksdir"], "Specified blocks director")
25-
os.mkdir(self.options.tmpdir+ "/blocksdir")
25+
blocksdir_path = os.path.join(self.options.tmpdir, 'blocksdir')
26+
self.nodes[0].assert_start_raises_init_error(["-blocksdir=" + blocksdir_path], re.escape('Error: Specified blocks directory "{}" does not exist.'.format(blocksdir_path)))
27+
os.mkdir(blocksdir_path)
2628
self.log.info("Starting with exiting blocksdir ...")
27-
self.start_node(0, ["-blocksdir="+self.options.tmpdir+ "/blocksdir"])
29+
self.start_node(0, ["-blocksdir=" + blocksdir_path])
2830
self.log.info("mining blocks..")
2931
self.nodes[0].generate(10)
30-
assert(os.path.isfile(os.path.join(self.options.tmpdir, "blocksdir", "regtest", "blocks", "blk00000.dat")))
31-
assert(os.path.isdir(os.path.join(self.options.tmpdir, "node0", "regtest", "blocks", "index")))
32+
assert os.path.isfile(os.path.join(blocksdir_path, "regtest", "blocks", "blk00000.dat"))
33+
assert os.path.isdir(os.path.join(self.nodes[0].datadir, "regtest", "blocks", "index"))
34+
3235

3336
if __name__ == '__main__':
3437
BlocksdirTest().main()

0 commit comments

Comments
 (0)