From ee27c7db8fd62030142fbbfc9a4f3b33d8d060c2 Mon Sep 17 00:00:00 2001 From: Zachary Ware Date: Tue, 20 Oct 2026 15:18:34 -0700 Subject: [PATCH] Keep memory report aligned in regrtest output --- Lib/test/libregrtest/logger.py | 11 ++++++----- Lib/test/test_regrtest.py | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Lib/test/libregrtest/logger.py b/Lib/test/libregrtest/logger.py index 4e011ef06f8a91..7c1d9e528010c3 100644 --- a/Lib/test/libregrtest/logger.py +++ b/Lib/test/libregrtest/logger.py @@ -29,11 +29,12 @@ def log(self, line: str = '') -> None: if self.get_mem_usage is not None: mem = self.get_mem_usage() if mem: - mib = mem / (1024*1024) - if mib >= 1024: - line = f"mem: {mib / 1024:.1f} GiB {line}" - else: - line = f"mem: {mib:.1f} MiB {line}" + qty = mem / (1024*1024) + unit = 'MiB' + if qty >= 1024: + qty = qty / 1024 + unit = 'GiB' + line = f"mem: {qty:6.1f} {unit} {line}" # Add the system load prefix: "load avg: 1.80 " load_avg = self.get_load_avg() diff --git a/Lib/test/test_regrtest.py b/Lib/test/test_regrtest.py index 53f0a2863dc4e4..dc9770fb4e5fbd 100644 --- a/Lib/test/test_regrtest.py +++ b/Lib/test/test_regrtest.py @@ -48,7 +48,7 @@ LOG_PREFIX = ( r'[0-9]+:[0-9]+:[0-9]+ ' r'(?:load avg: [0-9]+\.[0-9]{2} )?' - r'(?:mem: [0-9]+\.[0-9] (?:MiB|GiB) )?' + r'(?:mem: +[0-9]+\.[0-9] (?:MiB|GiB) )?' ) RESULT_REGEX = ( 'passed',