Page MenuHomePhabricator
Files F13115536

D7107.diff
No OneTemporary
Actions

D7107.diff
View Options

diff --git a/test/config.ini.cmake.in b/test/config.ini.cmake.in
--- a/test/config.ini.cmake.in
+++ b/test/config.ini.cmake.in
@@ -7,6 +7,7 @@
# test/functional/test_runner.py and test/util/bitcoin-util-test.py
[environment]
+PACKAGE_NAME=${PACKAGE_NAME}
SRCDIR=${CMAKE_SOURCE_DIR}
BUILDDIR=${CMAKE_BINARY_DIR}
EXEEXT=${CMAKE_EXECUTABLE_SUFFIX}
diff --git a/test/config.ini.in b/test/config.ini.in
--- a/test/config.ini.in
+++ b/test/config.ini.in
@@ -6,6 +6,7 @@
# test/functional/test_runner.py and test/util/bitcoin-util-test.py
[environment]
+PACKAGE_NAME=@PACKAGE_NAME@
SRCDIR=@abs_top_srcdir@
BUILDDIR=@abs_top_builddir@
EXEEXT=@EXEEXT@
diff --git a/test/functional/feature_filelock.py b/test/functional/feature_filelock.py
--- a/test/functional/feature_filelock.py
+++ b/test/functional/feature_filelock.py
@@ -25,8 +25,8 @@
self.log.info(
"Check that we can't start a second bitcoind instance using the same datadir")
- expected_msg = "Error: Cannot obtain a lock on data directory {}. Bitcoin ABC is probably already running.".format(
- datadir)
+ expected_msg = "Error: Cannot obtain a lock on data directory {0}. {1} is probably already running.".format(
+ datadir, self.config['environment']['PACKAGE_NAME'])
self.nodes[1].assert_start_raises_init_error(extra_args=[
'-datadir={}'.format(self.nodes[0].datadir), '-noserver'], expected_msg=expected_msg)
diff --git a/test/functional/interface_bitcoin_cli.py b/test/functional/interface_bitcoin_cli.py
--- a/test/functional/interface_bitcoin_cli.py
+++ b/test/functional/interface_bitcoin_cli.py
@@ -24,7 +24,8 @@
"""Main test logic"""
cli_response = self.nodes[0].cli("-version").send_cli()
- assert "Bitcoin ABC RPC client version" in cli_response
+ assert "{} RPC client version".format(
+ self.config['environment']['PACKAGE_NAME']) in cli_response
self.log.info(
"Compare responses from getwalletinfo RPC and `bitcoin-cli getwalletinfo`")

File Metadata

Mime Type
text/plain
Expires
Sat, Mar 1, 11:19 (8 h, 21 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5187572
Default Alt Text
D7107.diff (2 KB)

Event Timeline