Skip to content

Commit 6e69fea

Browse files
committed
Merge bitcoin/bitcoin#27280: test: Fix TypeError (expected str instance, bytes found) in wait_for_debug_log
33337eb test: Fix TypeError in wait_for_debug_log (MarcoFalke) Pull request description: ACKs for top commit: davidgumberg: tACK bitcoin/bitcoin@33337eb Tree-SHA512: e641f23f0adc074d12b0ee10cab5845c16f3ac2858e42f895c69857c375fcb15c31bc1c9476bf2b6e2b49d0d2db4944687733da16d4a464152ae3323cbc6ca68
2 parents 34551cb + 33337eb commit 6e69fea

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

test/functional/test_framework/test_node.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@ def wait_for_debug_log(self, expected_msgs, timeout=60):
469469
return
470470

471471
if time.time() >= time_end:
472-
print_log = " - " + "\n - ".join(log.splitlines())
472+
print_log = " - " + "\n - ".join(log.decode("utf8", errors="replace").splitlines())
473473
break
474474

475475
# No sleep here because we want to detect the message fragment as fast as

0 commit comments

Comments
 (0)