From: Jeremy Harris Date: Sun, 12 May 2024 09:45:51 +0000 (+0100) Subject: Testsuite: fix munge for mailq X-Git-Tag: exim-4.98-RC0~23 X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/e7ee19e5c96ecc1e1960efa8835dc08e6b39dc8a Testsuite: fix munge for mailq --- diff --git a/test/runtest b/test/runtest index 9e25a200f..8fe873a97 100755 --- a/test/runtest +++ b/test/runtest @@ -911,7 +911,7 @@ RESET_AFTER_EXTRA_LINE_READ: s/([\s,])S=\d+\b/$1S=sss/; s/:S\d+\b/:Ssss/; - s/^(\s*\d+[mhd]\s+)\d+(\s+(?:[a-z0-9-]{23}|[a-z0-9-]{18}) <)/TTT sss$2/i if $is_stdout; + s/^(\s*\d+[mhd]\s+)\d+(\s+(?:[[:alnum:]-]{23}|[[:alnum:]-]{16}) <)/TTT sss$2/i if $is_stdout; s/\sSIZE=\d+\b/ SIZE=ssss/; s/\ssize=\d+\b/ size=sss/ if $is_stderr; s/old size = \d+\b/old size = sssss/; diff --git a/test/stdout/0699 b/test/stdout/0699 index 885d57928..52c85a1d1 100644 --- a/test/stdout/0699 +++ b/test/stdout/0699 @@ -1,5 +1,5 @@ ### Check that delivery of old-format spoolfiles works -TTT sss 10HmaX-0005vi-00-H +TTT sss 10HmaX-0005vi-00 nulldeliver@test.ex ### Check that the format-mangler utility can downgrade spoolfiles @@ -7,7 +7,7 @@ TTT sss 10HmaX-000000005vi-0000 nulldeliver@test.ex exim_id_update exit code = 0 -TTT sss 10HmaY-0005vi-00-H +TTT sss 10HmaY-0005vi-00 nulldeliver@test.ex ### Check that the format-mangler utility can upgrade spoolfiles