diff --git a/tests/fixtures.py b/tests/fixtures.py index 01df94b26..10f870e38 100644 --- a/tests/fixtures.py +++ b/tests/fixtures.py @@ -164,8 +164,7 @@ def printCrashLog(node): errors, fname = getCrashLog(node) if errors: print("-" * 10, "{} (last 50 lines)".format(fname), "-" * 10) - for l in errors[-50:]: - print(l, end='') + print("".join(errors[-50:])) print("-" * 80) return 1 if errors else 0 diff --git a/tests/utils.py b/tests/utils.py index b0f218b66..5aa6e25b3 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -679,10 +679,9 @@ class NodeFactory(object): if fake_bitcoin_cli: cli = os.path.join(lightning_dir, "fake-bitcoin-cli") with open(cli, "w") as text_file: - print("""#! /bin/sh - ! [ -f bitcoin-cli-fail ] || exit `cat bitcoin-cli-fail` - exec bitcoin-cli "$@" - """, file=text_file) + text_file.write('#! /bin/sh\n' + '! [ -f bitcoin-cli-fail ] || exit `cat bitcoin-cli-fail`\n' + 'exec bitcoin-cli "$@"\n') os.chmod(cli, os.stat(cli).st_mode | stat.S_IEXEC) daemon.opts['bitcoin-cli'] = cli