Skip to content

Commit 638d638

Browse files
authored
Keep memory report aligned in regrtest output (#159967)
1 parent 2c142a1 commit 638d638

2 files changed

Lines changed: 7 additions & 6 deletions

File tree

‎Lib/test/libregrtest/logger.py‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,12 @@ def log(self, line: str = '') -> None:
2929
if self.get_mem_usage is not None:
3030
mem = self.get_mem_usage()
3131
if mem:
32-
mib = mem / (1024*1024)
33-
if mib >= 1024:
34-
line = f"mem: {mib / 1024:.1f} GiB {line}"
35-
else:
36-
line = f"mem: {mib:.1f} MiB {line}"
32+
qty = mem / (1024*1024)
33+
unit = 'MiB'
34+
if qty >= 1024:
35+
qty = qty / 1024
36+
unit = 'GiB'
37+
line = f"mem: {qty:6.1f} {unit} {line}"
3738

3839
# Add the system load prefix: "load avg: 1.80 "
3940
load_avg = self.get_load_avg()

‎Lib/test/test_regrtest.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
LOG_PREFIX = (
4949
r'[0-9]+:[0-9]+:[0-9]+ '
5050
r'(?:load avg: [0-9]+\.[0-9]{2} )?'
51-
r'(?:mem: [0-9]+\.[0-9] (?:MiB|GiB) )?'
51+
r'(?:mem: +[0-9]+\.[0-9] (?:MiB|GiB) )?'
5252
)
5353
RESULT_REGEX = (
5454
'passed',

0 commit comments

Comments
 (0)