aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorJon Atack <jon@atack.com>2019-12-29 18:54:33 +0100
committerJon Atack <jon@atack.com>2020-03-04 14:24:19 +0100
commit819fb5549b0d02477f47b3c40338071f37b6d885 (patch)
tree2e3869a5ef7d224a551f91f84645efbf187e0c62 /test
parentdcaf543ba0241f9219cea70b67c7b066d4c9ca9b (diff)
downloadbitcoin-819fb5549b0d02477f47b3c40338071f37b6d885.tar.xz
logging: asmap logging and #include fixups
- move asmap #includes to sorted positions in addrman and init (move-only) - remove redundant quotes in asmap InitError, update test - remove full stops from asmap logging to be consistent with debug logging, update tests
Diffstat (limited to 'test')
-rwxr-xr-xtest/functional/feature_asmap.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/functional/feature_asmap.py b/test/functional/feature_asmap.py
index 8f5a77c92d..dd12633f50 100755
--- a/test/functional/feature_asmap.py
+++ b/test/functional/feature_asmap.py
@@ -32,8 +32,8 @@ ASMAP = '../../src/test/data/asmap.raw' # path to unit test skeleton asmap
VERSION = 'fec61fa21a9f46f3b17bdcd660d7f4cd90b966aad3aec593c99b35f0aca15853'
def expected_messages(filename):
- return ['Opened asmap file "{}" (59 bytes) from disk.'.format(filename),
- 'Using asmap version {} for IP bucketing.'.format(VERSION)]
+ return ['Opened asmap file "{}" (59 bytes) from disk'.format(filename),
+ 'Using asmap version {} for IP bucketing'.format(VERSION)]
class AsmapTest(BitcoinTestFramework):
def set_test_params(self):
@@ -77,7 +77,7 @@ class AsmapTest(BitcoinTestFramework):
def test_default_asmap_with_missing_file(self):
self.log.info('Test bitcoind -asmap with missing default map file')
self.stop_node(0)
- msg = "Error: Could not find asmap file '\"{}\"'".format(self.default_asmap)
+ msg = "Error: Could not find asmap file \"{}\"".format(self.default_asmap)
self.node.assert_start_raises_init_error(extra_args=['-asmap'], expected_msg=msg)
def test_empty_asmap(self):