Testsuite: fix munge for mailq

diff --git a/test/runtest b/test/runtest
index 9e25a200f865b44f65daf6d1e168fb4a4700f444..8fe873a97249f59bf6f5180cf627e2099f47794f 100755 (executable)
--- 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,])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/;
   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 885d579282b5791622deadd48b008d36a60c51a8..52c85a1d12ff99a4eab87ea820ecd9acf81d32ac 100644 (file)
--- a/test/stdout/0699
+++ b/test/stdout/0699
@@ -1,5 +1,5 @@
 ### Check that delivery of old-format spoolfiles works
 ### Check that delivery of old-format spoolfiles works

-TTT   sss 10HmaX-0005vi-00-H <nobody@test.ex>
+TTT   sss 10HmaX-0005vi-00 <nobody@test.ex>

           nulldeliver@test.ex
 
 ### Check that the format-mangler utility can downgrade spoolfiles
           nulldeliver@test.ex
 
 ### Check that the format-mangler utility can downgrade spoolfiles


@@ -7,7 +7,7 @@ TTT   sss 10HmaX-000000005vi-0000 <CALLER@the.local.host.name>
           nulldeliver@test.ex
 
 exim_id_update exit code = 0
           nulldeliver@test.ex
 
 exim_id_update exit code = 0

-TTT   sss 10HmaY-0005vi-00-H <CALLER@the.local.host.name>
+TTT   sss 10HmaY-0005vi-00 <CALLER@the.local.host.name>

           nulldeliver@test.ex
 
 ### Check that the format-mangler utility can upgrade spoolfiles
           nulldeliver@test.ex
 
 ### Check that the format-mangler utility can upgrade spoolfiles