[exim-cvs] Testsuite: fix munge for mailq

Gitweb: https://git.exim.org/exim.git/commitdiff/e7ee19e5c96ecc1e1960efa8835dc08e6b39dc8a

Commit:     e7ee19e5c96ecc1e1960efa8835dc08e6b39dc8a
Parent:     0585799ba85d257f1e2428c1615b00c30c60931e
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Sun May 12 10:45:51 2024 +0100
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Sun May 12 10:45:51 2024 +0100

    Testsuite: fix munge for mailq
---
 test/runtest     | 2 +-
 test/stdout/0699 | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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 <nobody@???>
+TTT   sss 10HmaX-0005vi-00 <nobody@???>
           nulldeliver@???

 ### Check that the format-mangler utility can downgrade spoolfiles
@@ -7,7 +7,7 @@ TTT   sss 10HmaX-000000005vi-0000 <CALLER@???>
           nulldeliver@???

 exim_id_update exit code = 0
-TTT   sss 10HmaY-0005vi-00-H <CALLER@???>
+TTT   sss 10HmaY-0005vi-00 <CALLER@???>
           nulldeliver@???

### Check that the format-mangler utility can upgrade spoolfiles

--
## subscription configuration (requires account):
## https://lists.exim.org/mailman3/postorius/lists/exim-cvs.lists.exim.org/
## unsubscribe (doesn't require an account):
## exim-cvs-unsubscribe@???
## Exim details at http://www.exim.org/
## Please use the Wiki with this list - http://wiki.exim.org/