Testsuite: more munging for mailq output

diff --git a/test/runtest b/test/runtest
index bc570842a91bdbe5b1313a128b3137fb4b359c86..80b7721fb13578df991dbd7f5c25c5d4caebe141 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -891,7 +891,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} <)/TTT   sss$2/i if $is_stdout;
+  s/^(\s*\d+[mhd]\s+)\d+(\s+(?:[a-z0-9-]{23}|[a-z0-9-]{18}) <)/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 c8434157bc9c6374984b939cf8a0941e403ba948..bd8fab1c73f7a1df20e12154414681a7c4cd679e 100644 (file)
--- a/test/stdout/0699
+++ b/test/stdout/0699
@@ -2,7 +2,7 @@ TTT   sss 10HmaX-000000005vi-0000 <CALLER@the.local.host.name>
           nulldeliver@test.ex
 
 exim_id_update exit code = 0
- 0m   396 10HmaY-0005vi-00-H <CALLER@the.local.host.name>
+TTT   sss 10HmaY-0005vi-00-H <CALLER@the.local.host.name>
           nulldeliver@test.ex
 
 exim_id_update exit code = 0