test: use f-strings in feature_logging.py

pull/22229/head
fanquake 3 years ago
parent fb633933ab
commit 6679eceacc
No known key found for this signature in database
GPG Key ID: 2EEB9F5CC09526C1

@ -29,7 +29,7 @@ class LoggingTest(BitcoinTestFramework):
# test alternative log file name outside datadir # test alternative log file name outside datadir
tempname = os.path.join(self.options.tmpdir, "foo.log") tempname = os.path.join(self.options.tmpdir, "foo.log")
self.restart_node(0, ["-debuglogfile=%s" % tempname]) self.restart_node(0, [f"-debuglogfile={tempname}"])
assert os.path.isfile(tempname) assert os.path.isfile(tempname)
# check that invalid log (relative) will cause error # check that invalid log (relative) will cause error
@ -37,26 +37,26 @@ class LoggingTest(BitcoinTestFramework):
invalidname = os.path.join("foo", "foo.log") invalidname = os.path.join("foo", "foo.log")
self.stop_node(0) self.stop_node(0)
exp_stderr = r"Error: Could not open debug log file \S+$" exp_stderr = r"Error: Could not open debug log file \S+$"
self.nodes[0].assert_start_raises_init_error(["-debuglogfile=%s" % (invalidname)], exp_stderr, match=ErrorMatch.FULL_REGEX) self.nodes[0].assert_start_raises_init_error([f"-debuglogfile={invalidname}"], exp_stderr, match=ErrorMatch.FULL_REGEX)
assert not os.path.isfile(os.path.join(invdir, "foo.log")) assert not os.path.isfile(os.path.join(invdir, "foo.log"))
# check that invalid log (relative) works after path exists # check that invalid log (relative) works after path exists
self.stop_node(0) self.stop_node(0)
os.mkdir(invdir) os.mkdir(invdir)
self.start_node(0, ["-debuglogfile=%s" % (invalidname)]) self.start_node(0, [f"-debuglogfile={invalidname}"])
assert os.path.isfile(os.path.join(invdir, "foo.log")) assert os.path.isfile(os.path.join(invdir, "foo.log"))
# check that invalid log (absolute) will cause error # check that invalid log (absolute) will cause error
self.stop_node(0) self.stop_node(0)
invdir = os.path.join(self.options.tmpdir, "foo") invdir = os.path.join(self.options.tmpdir, "foo")
invalidname = os.path.join(invdir, "foo.log") invalidname = os.path.join(invdir, "foo.log")
self.nodes[0].assert_start_raises_init_error(["-debuglogfile=%s" % invalidname], exp_stderr, match=ErrorMatch.FULL_REGEX) self.nodes[0].assert_start_raises_init_error([f"-debuglogfile={invalidname}"], exp_stderr, match=ErrorMatch.FULL_REGEX)
assert not os.path.isfile(os.path.join(invdir, "foo.log")) assert not os.path.isfile(os.path.join(invdir, "foo.log"))
# check that invalid log (absolute) works after path exists # check that invalid log (absolute) works after path exists
self.stop_node(0) self.stop_node(0)
os.mkdir(invdir) os.mkdir(invdir)
self.start_node(0, ["-debuglogfile=%s" % (invalidname)]) self.start_node(0, [f"-debuglogfile={invalidname}"])
assert os.path.isfile(os.path.join(invdir, "foo.log")) assert os.path.isfile(os.path.join(invdir, "foo.log"))
# check that -nodebuglogfile disables logging # check that -nodebuglogfile disables logging
@ -67,7 +67,7 @@ class LoggingTest(BitcoinTestFramework):
assert not os.path.isfile(default_log_path) assert not os.path.isfile(default_log_path)
# just sanity check no crash here # just sanity check no crash here
self.restart_node(0, ["-debuglogfile=%s" % os.devnull]) self.restart_node(0, [f"-debuglogfile={os.devnull}"])
if __name__ == '__main__': if __name__ == '__main__':

Loading…
Cancel
Save