Skip to content

Commit 54fe963

Browse files
committed
Merge bitcoin/bitcoin#28035: test: Ignore UTF-8 errors in assert_debug_log
fa3d729 lint: Ignore check_fileopens failure on **kwargs (MarcoFalke) fa6bb85 test: Ignore UTF-8 errors in assert_debug_log (MarcoFalke) fa63326 test: Fix debug_log_size helper (MarcoFalke) Pull request description: Fix two bugs, see commit messages. ACKs for top commit: theStack: utACK fa3d729 Tree-SHA512: 4a29bdf954bf62bb7676c2a41b03ad017bc86d535b2bd912c96bd41d1621beb06d840b53c211480ad51974e8b293bbae620060d2528d269159f32c0b44e47712
2 parents 32c1523 + fa3d729 commit 54fe963

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

test/functional/test_framework/test_node.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -424,8 +424,8 @@ def debug_log_path(self) -> Path:
424424
def wallets_path(self) -> Path:
425425
return self.chain_path / "wallets"
426426

427-
def debug_log_bytes(self) -> int:
428-
with open(self.debug_log_path, encoding='utf-8') as dl:
427+
def debug_log_size(self, **kwargs) -> int:
428+
with open(self.debug_log_path, **kwargs) as dl:
429429
dl.seek(0, 2)
430430
return dl.tell()
431431

@@ -434,13 +434,13 @@ def assert_debug_log(self, expected_msgs, unexpected_msgs=None, timeout=2):
434434
if unexpected_msgs is None:
435435
unexpected_msgs = []
436436
time_end = time.time() + timeout * self.timeout_factor
437-
prev_size = self.debug_log_bytes()
437+
prev_size = self.debug_log_size(encoding="utf-8") # Must use same encoding that is used to read() below
438438

439439
yield
440440

441441
while True:
442442
found = True
443-
with open(self.debug_log_path, encoding='utf-8') as dl:
443+
with open(self.debug_log_path, encoding="utf-8", errors="replace") as dl:
444444
dl.seek(prev_size)
445445
log = dl.read()
446446
print_log = " - " + "\n - ".join(log.splitlines())
@@ -465,7 +465,7 @@ def wait_for_debug_log(self, expected_msgs, timeout=60):
465465
the number of log lines we encountered when matching
466466
"""
467467
time_end = time.time() + timeout * self.timeout_factor
468-
prev_size = self.debug_log_bytes()
468+
prev_size = self.debug_log_size(mode="rb") # Must use same mode that is used to read() below
469469

470470
yield
471471

test/lint/lint-python-utf8-encoding.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def check_fileopens():
2828
if e.returncode > 1:
2929
raise e
3030

31-
filtered_fileopens = [fileopen for fileopen in fileopens if not re.search(r"encoding=.(ascii|utf8|utf-8).|open\([^,]*, ['\"][^'\"]*b[^'\"]*['\"]", fileopen)]
31+
filtered_fileopens = [fileopen for fileopen in fileopens if not re.search(r"encoding=.(ascii|utf8|utf-8).|open\([^,]*, (\*\*kwargs|['\"][^'\"]*b[^'\"]*['\"])", fileopen)]
3232

3333
return filtered_fileopens
3434

0 commit comments

Comments
 (0)