diff options
| author | fanquake <fanquake@gmail.com> | 2023-03-22 09:48:41 +0000 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2023-03-22 10:01:01 +0000 |
| commit | 6e69fead2baf4a40209863bca1df990830fc481a (patch) | |
| tree | 38bcd79241caac26f9e98d695e2acb19239c2e59 /test/functional | |
| parent | 34551cb97aff88ab761d6ab7afa942720614abf7 (diff) | |
| parent | 33337eb86028662e632107411efec1e63b1c01bf (diff) | |
Merge bitcoin/bitcoin#27280: test: Fix TypeError (expected str instance, bytes found) in wait_for_debug_log
33337eb86028662e632107411efec1e63b1c01bf test: Fix TypeError in wait_for_debug_log (MarcoFalke)
Pull request description:
ACKs for top commit:
davidgumberg:
tACK https://github.com/bitcoin/bitcoin/pull/27280/commits/33337eb86028662e632107411efec1e63b1c01bf
Tree-SHA512: e641f23f0adc074d12b0ee10cab5845c16f3ac2858e42f895c69857c375fcb15c31bc1c9476bf2b6e2b49d0d2db4944687733da16d4a464152ae3323cbc6ca68
Diffstat (limited to 'test/functional')
| -rwxr-xr-x | test/functional/test_framework/test_node.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/functional/test_framework/test_node.py b/test/functional/test_framework/test_node.py index 882f82e0f2..56abe5f26a 100755 --- a/test/functional/test_framework/test_node.py +++ b/test/functional/test_framework/test_node.py @@ -469,7 +469,7 @@ class TestNode(): return if time.time() >= time_end: - print_log = " - " + "\n - ".join(log.splitlines()) + print_log = " - " + "\n - ".join(log.decode("utf8", errors="replace").splitlines()) break # No sleep here because we want to detect the message fragment as fast as |