[exim-cvs] Testsuite: more munging for mailq output

Autor: Exim Git Commits Mailing List
Data:
Dla: exim-cvs
Temat: [exim-cvs] Testsuite: more munging for mailq output

Gitweb: https://git.exim.org/exim.git/commitdiff/1011d57310ad2ecdb29b7ddb783baa19c3ed1ffa

Commit:     1011d57310ad2ecdb29b7ddb783baa19c3ed1ffa
Parent:     641c3ed52f0a4d730eb4bed7f2dd482825347a94
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Sat Jul 1 19:48:15 2023 +0100
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Sat Jul 1 20:37:23 2023 +0100

    Testsuite: more munging for mailq output
---
 test/runtest     |  2 +-
 test/stdout/0022 | 16 ++++++++--------
 test/stdout/0037 |  2 +-
 test/stdout/0154 | 20 ++++++++++----------
 test/stdout/0155 | 20 ++++++++++----------
 test/stdout/0177 |  4 ++--
 test/stdout/0185 |  2 +-
 test/stdout/0220 |  6 +++---
 test/stdout/0221 |  6 +++---
 test/stdout/0245 |  2 +-
 test/stdout/0302 |  2 +-
 test/stdout/0317 |  4 ++--
 test/stdout/0338 |  2 +-
 test/stdout/0360 |  2 +-
 test/stdout/0465 |  4 ++--
 test/stdout/0514 |  2 +-
 test/stdout/0576 | 16 ++++++++--------
 test/stdout/0611 |  2 +-
 test/stdout/0699 |  4 ++--
 test/stdout/5300 |  2 +-
 20 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/test/runtest b/test/runtest
index 8ad86365d..bc570842a 100755
--- 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+m\s+)\d+(\s+[a-z0-9-]{23} <)/$1sss$2/i if $is_stdout;
+  s/^(\s*\d+[mhd]\s+)\d+(\s+[a-z0-9-]{23} <)/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/0022 b/test/stdout/0022
index adb4b169a..e7a1bc6d7 100644
--- a/test/stdout/0022
+++ b/test/stdout/0022
@@ -127,11 +127,11 @@
 250 myhost.test.ex Hello test [V4NET.9.8.7]
 250 OK
 550 forcibly dropped
- 0m   304 10HmaX-000000005vi-0000 <CALLER@???> *** frozen ***
+TTT   sss 10HmaX-000000005vi-0000 <CALLER@???> *** frozen ***
           accept@y
           freeze@y

- 0m   306 10HmaZ-000000005vi-0000 <CALLER@???>
+TTT   sss 10HmaZ-000000005vi-0000 <CALLER@???>
           queue_only@y
           accept@y

@@ -213,26 +213,26 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 221
 <<< 221 myhost.test.ex closing connection
 End of script
- 0m   304 10HmaX-000000005vi-0000 <CALLER@???> *** frozen ***
+TTT   sss 10HmaX-000000005vi-0000 <CALLER@???> *** frozen ***
           accept@y
           freeze@y

- 0m   306 10HmaZ-000000005vi-0000 <CALLER@???>
+TTT   sss 10HmaZ-000000005vi-0000 <CALLER@???>
           queue_only@y
           accept@y

- 0m   174 10HmbB-000000005vi-0000 <x@y> *** frozen ***
+TTT   sss 10HmbB-000000005vi-0000 <x@y> *** frozen ***
           accept@y
           freeze@y

- 0m   190 10HmbC-000000005vi-0000 <x@y>
+TTT   sss 10HmbC-000000005vi-0000 <x@y>
           accept@y

- 0m   176 10HmbD-000000005vi-0000 <x@y>
+TTT   sss 10HmbD-000000005vi-0000 <x@y>
           queue_only@y
           accept@y

- 0m   190 10HmbE-000000005vi-0000 <x@y>
+TTT   sss 10HmbE-000000005vi-0000 <x@y>
           accept@y

 Connecting to 127.0.0.1 port 1225 ... connected
diff --git a/test/stdout/0037 b/test/stdout/0037
index dea414c6a..5fe47ee95 100644
--- a/test/stdout/0037
+++ b/test/stdout/0037
@@ -211,7 +211,7 @@ Testing Exim filter file "TESTSUITE/aux-fixed/0037.f-5"
 Testprint: Before fail
 Fail text "This is a forced failure"
 Filtering ended by "fail".
- 0m   sss 10HmbA-000000005vi-0000 <CALLER@???> *** frozen ***
+TTT   sss 10HmbA-000000005vi-0000 <CALLER@???> *** frozen ***
           userx@???
        +D system-filter
        +D userz@???
diff --git a/test/stdout/0154 b/test/stdout/0154
index 8bce51df9..6587d3c3b 100644
--- a/test/stdout/0154
+++ b/test/stdout/0154
@@ -1,30 +1,30 @@
- 0m   sss 10HmaX-000000005vi-0000 <CALLER@???>
+TTT   sss 10HmaX-000000005vi-0000 <CALLER@???>
           a@???

- 0m   sss 10HmaY-000000005vi-0000 <CALLER@???>
+TTT   sss 10HmaY-000000005vi-0000 <CALLER@???>
           b@???

- 0m   sss 10HmaZ-000000005vi-0000 <CALLER@???>
+TTT   sss 10HmaZ-000000005vi-0000 <CALLER@???>
           c@???

- 0m   sss 10HmbA-000000005vi-0000 <CALLER@???>
+TTT   sss 10HmbA-000000005vi-0000 <CALLER@???>
           d@???

- 0m   sss 10HmbB-000000005vi-0000 <CALLER@???>
+TTT   sss 10HmbB-000000005vi-0000 <CALLER@???>
           e@???

- 0m   sss 10HmbC-000000005vi-0000 <CALLER@???>
+TTT   sss 10HmbC-000000005vi-0000 <CALLER@???>
           f@???

- 0m   sss 10HmbD-000000005vi-0000 <CALLER@???>
+TTT   sss 10HmbD-000000005vi-0000 <CALLER@???>
           g@???

- 0m   sss 10HmbE-000000005vi-0000 <CALLER@???>
+TTT   sss 10HmbE-000000005vi-0000 <CALLER@???>
           h@???

- 0m   sss 10HmbF-000000005vi-0000 <CALLER@???>
+TTT   sss 10HmbF-000000005vi-0000 <CALLER@???>
           i@???

- 0m   sss 10HmbG-000000005vi-0000 <CALLER@???>
+TTT   sss 10HmbG-000000005vi-0000 <CALLER@???>
           j@???

diff --git a/test/stdout/0155 b/test/stdout/0155
index 1d908c18e..254b7e961 100644
--- a/test/stdout/0155
+++ b/test/stdout/0155
@@ -1,32 +1,32 @@
 ### exim -bp
- 0m   sss 10HmaX-000000005vi-0000 <CALLER@???>
+TTT   sss 10HmaX-000000005vi-0000 <CALLER@???>
           a@???

- 0m   sss 10HmaY-000000005vi-0000 <CALLER@???>
+TTT   sss 10HmaY-000000005vi-0000 <CALLER@???>
           b@???

- 0m   sss 10HmaZ-000000005vi-0000 <CALLER@???>
+TTT   sss 10HmaZ-000000005vi-0000 <CALLER@???>
           c@???

- 0m   sss 10HmbA-000000005vi-0000 <CALLER@???>
+TTT   sss 10HmbA-000000005vi-0000 <CALLER@???>
           d@???

- 0m   sss 10HmbB-000000005vi-0000 <CALLER@???>
+TTT   sss 10HmbB-000000005vi-0000 <CALLER@???>
           e@???

- 0m   sss 10HmbC-000000005vi-0000 <CALLER@???>
+TTT   sss 10HmbC-000000005vi-0000 <CALLER@???>
           f@???

- 0m   sss 10HmbD-000000005vi-0000 <CALLER@???>
+TTT   sss 10HmbD-000000005vi-0000 <CALLER@???>
           g@???

- 0m   sss 10HmbE-000000005vi-0000 <CALLER@???>
+TTT   sss 10HmbE-000000005vi-0000 <CALLER@???>
           h@???

- 0m   sss 10HmbF-000000005vi-0000 <CALLER@???>
+TTT   sss 10HmbF-000000005vi-0000 <CALLER@???>
           i@???

- 0m   sss 10HmbG-000000005vi-0000 <CALLER@???>
+TTT   sss 10HmbG-000000005vi-0000 <CALLER@???>
           j@???

 ### exim -bpi
diff --git a/test/stdout/0177 b/test/stdout/0177
index ca13f65d8..26fd516c5 100644
--- a/test/stdout/0177
+++ b/test/stdout/0177
@@ -1,8 +1,8 @@
- 0m   sss 10HmbA-000000005vi-0000 <CALLER@???> *** frozen ***
+TTT   sss 10HmbA-000000005vi-0000 <CALLER@???> *** frozen ***
           userx@???
        +D >usery:userx@???

- 0m   sss 10HmbG-000000005vi-0000 <CALLER@???> *** frozen ***
+TTT   sss 10HmbG-000000005vi-0000 <CALLER@???> *** frozen ***
           userz@???

diff --git a/test/stdout/0185 b/test/stdout/0185
index 5a909a1e3..68425b415 100644
--- a/test/stdout/0185
+++ b/test/stdout/0185
@@ -1,4 +1,4 @@
- 0m   sss 10HmaX-000000005vi-0000 <CALLER@???> *** frozen ***
+TTT   sss 10HmaX-000000005vi-0000 <CALLER@???> *** frozen ***
           usery@???

diff --git a/test/stdout/0220 b/test/stdout/0220
index f5456cdf9..78aee9464 100644
--- a/test/stdout/0220
+++ b/test/stdout/0220
@@ -5,12 +5,12 @@
 354 Enter message, ending with "." on a line by itself
 250 OK id=10HmbA-000000005vi-0000
 221 myhost.test.ex closing connection
- 0m   280 10HmbC-000000005vi-0000 <> (CALLER)
+TTT   sss 10HmbC-000000005vi-0000 <> (CALLER)
           userx@???

- 0m   337 10HmbD-000000005vi-0000 <foo@bar> (CALLER)
+TTT   sss 10HmbD-000000005vi-0000 <foo@bar> (CALLER)
           userx@???

- 0m   242 10HmbE-000000005vi-0000 <>
+TTT   sss 10HmbE-000000005vi-0000 <>
           userx@???

diff --git a/test/stdout/0221 b/test/stdout/0221
index 723443dbc..5381fe7dd 100644
--- a/test/stdout/0221
+++ b/test/stdout/0221
@@ -5,12 +5,12 @@
 354 Enter message, ending with "." on a line by itself
 250 OK id=10HmbA-000000005vi-0000
 221 myhost.test.ex closing connection
- 0m   280 10HmbC-000000005vi-0000 <> (CALLER)
+TTT   sss 10HmbC-000000005vi-0000 <> (CALLER)
           userx@???

- 0m   318 10HmbD-000000005vi-0000 <CALLER@???>
+TTT   sss 10HmbD-000000005vi-0000 <CALLER@???>
           userx@???

- 0m   242 10HmbE-000000005vi-0000 <>
+TTT   sss 10HmbE-000000005vi-0000 <>
           userx@???

diff --git a/test/stdout/0245 b/test/stdout/0245
index b34ec1aa3..03bc5ec48 100644
--- a/test/stdout/0245
+++ b/test/stdout/0245
@@ -1,4 +1,4 @@
- 0m   334 10HmaX-000000005vi-0000 <CALLER@???>
+TTT   sss 10HmaX-000000005vi-0000 <CALLER@???>
           "abc   def"@???
           xxx@yyy
           aaa@bbb
diff --git a/test/stdout/0302 b/test/stdout/0302
index 02ac75dc2..74ec307ea 100644
--- a/test/stdout/0302
+++ b/test/stdout/0302
@@ -1,4 +1,4 @@
- 0m   302 10HmaX-000000005vi-0000 <CALLER@???>
+TTT   sss 10HmaX-000000005vi-0000 <CALLER@???>
         D abcd@???
           defer@???

diff --git a/test/stdout/0317 b/test/stdout/0317
index abb4cb59e..f10ec7965 100644
--- a/test/stdout/0317
+++ b/test/stdout/0317
@@ -1,9 +1,9 @@
- 0m   294 10HmaX-000000005vi-0000 <CALLER@???>
+TTT   sss 10HmaX-000000005vi-0000 <CALLER@???>
           x@???
           a@???
           p@???

- 0m   366 10HmaY-000000005vi-0000 <CALLER@???>
+TTT   sss 10HmaY-000000005vi-0000 <CALLER@???>
           aa@???
           pp@???
           xx@???
diff --git a/test/stdout/0338 b/test/stdout/0338
index 813c272b7..e33aeeeb2 100644
--- a/test/stdout/0338
+++ b/test/stdout/0338
@@ -1,4 +1,4 @@
- 0m   297 10HmaX-000000005vi-0000 <CALLER@???>
+TTT   sss 10HmaX-000000005vi-0000 <CALLER@???>
         D userx@???
           a1-userx@???

diff --git a/test/stdout/0360 b/test/stdout/0360
index 48f87eb17..885ee7456 100644
--- a/test/stdout/0360
+++ b/test/stdout/0360
@@ -1,4 +1,4 @@
- 0m   sss 10HmaX-000000005vi-0000 <CALLER@???>
+TTT   sss 10HmaX-000000005vi-0000 <CALLER@???>
           cms@???
        +D unknown@???
        +D unknown@???
diff --git a/test/stdout/0465 b/test/stdout/0465
index 1a65979de..0f81b189e 100644
--- a/test/stdout/0465
+++ b/test/stdout/0465
@@ -17,9 +17,9 @@
 354 Enter message, ending with "." on a line by itself
 550 Administrative prohibition
 221 myhost.test.ex closing connection
- 0m   265 10HmaY-000000005vi-0000 <>
+TTT   sss 10HmaY-000000005vi-0000 <>
           abc@domain

- 0m   281 10HmaZ-000000005vi-0000 <abc@somewhere>
+TTT   sss 10HmaZ-000000005vi-0000 <abc@somewhere>
           xxx@yyy

diff --git a/test/stdout/0514 b/test/stdout/0514
index db13b7e1a..516e882b3 100644
--- a/test/stdout/0514
+++ b/test/stdout/0514
@@ -1,4 +1,4 @@
- 0m   356 10HmaX-000000005vi-0000 <"spaced user"@???>
+TTT   sss 10HmaX-000000005vi-0000 <"spaced user"@???>
           userx@???

 10HmaX-000000005vi-0000-H
diff --git a/test/stdout/0576 b/test/stdout/0576
index 5021e089f..cae3620b1 100644
--- a/test/stdout/0576
+++ b/test/stdout/0576
@@ -11,11 +11,11 @@
 250 OK id=10HmaY-000000005vi-0000
 221 the.local.host.name closing connection
 ### default q
- 0m   sss 10HmaX-000000005vi-0000 <CALLER@???>
+TTT   sss 10HmaX-000000005vi-0000 <CALLER@???>
           normal@???

 ### alternate q
- 0m   sss 10HmaY-000000005vi-0000 <CALLER@???>
+TTT   sss 10HmaY-000000005vi-0000 <CALLER@???>
           alternate@???

 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
@@ -46,11 +46,11 @@
 250 OK id=10HmbC-000000005vi-0000
 221 the.local.host.name closing connection
 ### default q
- 0m   sss 10HmbB-000000005vi-0000 <CALLER@???>
+TTT   sss 10HmbB-000000005vi-0000 <CALLER@???>
           normal@???

 ### alternate q
- 0m   sss 10HmbC-000000005vi-0000 <CALLER@???>
+TTT   sss 10HmbC-000000005vi-0000 <CALLER@???>
           alternate@???

 ### move msg from default to third q
@@ -58,18 +58,18 @@ Message 10HmbB-000000005vi-0000
 ### move msg from alternate q to third q
 Message 10HmbC-000000005vi-0000 
 ### third q
- 0m   sss 10HmbB-000000005vi-0000 <CALLER@???>
+TTT   sss 10HmbB-000000005vi-0000 <CALLER@???>
           normal@???

- 0m   sss 10HmbC-000000005vi-0000 <CALLER@???>
+TTT   sss 10HmbC-000000005vi-0000 <CALLER@???>
           alternate@???

 Message 10HmbB-000000005vi-0000 Message 10HmbC-000000005vi-0000 
 ### default q
- 0m   sss 10HmbB-000000005vi-0000 <CALLER@???>
+TTT   sss 10HmbB-000000005vi-0000 <CALLER@???>
           normal@???

- 0m   sss 10HmbC-000000005vi-0000 <CALLER@???>
+TTT   sss 10HmbC-000000005vi-0000 <CALLER@???>
           alternate@???

 ### alternate q
diff --git a/test/stdout/0611 b/test/stdout/0611
index 49e48d4cf..a9a3126cf 100644
--- a/test/stdout/0611
+++ b/test/stdout/0611
@@ -24,7 +24,7 @@ Display options:
     -R        Reverse order
     -a        All recipients (including delivered)
 exiqgrep exit code = 0
- 0m   278 10HmaX-000000005vi-0000 <CALLER@???>
+TTT   sss 10HmaX-000000005vi-0000 <CALLER@???>
       a@???
       b@???
       c@???
diff --git a/test/stdout/0699 b/test/stdout/0699
index 296d7f70c..c8434157b 100644
--- a/test/stdout/0699
+++ b/test/stdout/0699
@@ -1,4 +1,4 @@
- 0m   396 10HmaX-000000005vi-0000 <CALLER@???>
+TTT   sss 10HmaX-000000005vi-0000 <CALLER@???>
           nulldeliver@???

 exim_id_update exit code = 0
@@ -6,6 +6,6 @@ exim_id_update exit code = 0
           nulldeliver@???

 exim_id_update exit code = 0
-DDd   317 10HmaY-000000005vi-0000 <nobody@???>
+TTT   sss 10HmaY-000000005vi-0000 <nobody@???>
           nulldeliver@???

diff --git a/test/stdout/5300 b/test/stdout/5300
index 9e7dc1fc0..aacfbf2d1 100644
--- a/test/stdout/5300
+++ b/test/stdout/5300
@@ -3,7 +3,7 @@ x@[V4NET.9.8.7]
   host [V4NET.9.8.7] [V4NET.9.8.7]
 x@???
   router = r3, transport = t1
- 0m   282 10HmaX-000000005vi-0000 <y@???>
+TTT   sss 10HmaX-000000005vi-0000 <y@???>
           zz@???

220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

--
## 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/