Gitweb:
https://git.exim.org/exim.git/commitdiff/907e673a7b74cd382af3ba40f1d8bc53cb685a8b
Commit: 907e673a7b74cd382af3ba40f1d8bc53cb685a8b
Parent: 46a36afae41f63de654269c8a0b7cf5852a85a14
Author: Jeremy Harris <jgh146exb@???>
AuthorDate: Sat Jul 1 16:10:22 2023 +0100
Committer: Jeremy Harris <jgh146exb@???>
CommitDate: Sat Jul 1 16:10:29 2023 +0100
Testsuite: munging change for new message-id format
Broken-by: 46a36afae41f
---
test/runtest | 2 +-
test/stdout/0037 | 2 +-
test/stdout/0154 | 20 ++++++++++----------
test/stdout/0155 | 20 ++++++++++----------
test/stdout/0177 | 4 ++--
test/stdout/0185 | 2 +-
test/stdout/0360 | 2 +-
test/stdout/0576 | 16 ++++++++--------
8 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/test/runtest b/test/runtest
index 5e9f6c25c..c99320b6e 100755
--- a/test/runtest
+++ b/test/runtest
@@ -889,7 +889,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-]{16} <)/$1sss$2/i if $is_stdout;
+ s/^(\s*\d+m\s+)\d+(\s+[a-z0-9-]{23} <)/$1sss$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/0037 b/test/stdout/0037
index a1eea6563..dea414c6a 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 373 10HmbA-000000005vi-0000 <CALLER@???> *** frozen ***
+ 0m sss 10HmbA-000000005vi-0000 <CALLER@???> *** frozen ***
userx@???
+D system-filter
+D userz@???
diff --git a/test/stdout/0154 b/test/stdout/0154
index 45a40fdb7..8bce51df9 100644
--- a/test/stdout/0154
+++ b/test/stdout/0154
@@ -1,30 +1,30 @@
- 0m 293 10HmaX-000000005vi-0000 <CALLER@???>
+ 0m sss 10HmaX-000000005vi-0000 <CALLER@???>
a@???
- 0m 293 10HmaY-000000005vi-0000 <CALLER@???>
+ 0m sss 10HmaY-000000005vi-0000 <CALLER@???>
b@???
- 0m 293 10HmaZ-000000005vi-0000 <CALLER@???>
+ 0m sss 10HmaZ-000000005vi-0000 <CALLER@???>
c@???
- 0m 293 10HmbA-000000005vi-0000 <CALLER@???>
+ 0m sss 10HmbA-000000005vi-0000 <CALLER@???>
d@???
- 0m 293 10HmbB-000000005vi-0000 <CALLER@???>
+ 0m sss 10HmbB-000000005vi-0000 <CALLER@???>
e@???
- 0m 293 10HmbC-000000005vi-0000 <CALLER@???>
+ 0m sss 10HmbC-000000005vi-0000 <CALLER@???>
f@???
- 0m 293 10HmbD-000000005vi-0000 <CALLER@???>
+ 0m sss 10HmbD-000000005vi-0000 <CALLER@???>
g@???
- 0m 293 10HmbE-000000005vi-0000 <CALLER@???>
+ 0m sss 10HmbE-000000005vi-0000 <CALLER@???>
h@???
- 0m 293 10HmbF-000000005vi-0000 <CALLER@???>
+ 0m sss 10HmbF-000000005vi-0000 <CALLER@???>
i@???
- 0m 293 10HmbG-000000005vi-0000 <CALLER@???>
+ 0m sss 10HmbG-000000005vi-0000 <CALLER@???>
j@???
diff --git a/test/stdout/0155 b/test/stdout/0155
index f2fb036d2..1d908c18e 100644
--- a/test/stdout/0155
+++ b/test/stdout/0155
@@ -1,32 +1,32 @@
### exim -bp
- 0m 293 10HmaX-000000005vi-0000 <CALLER@???>
+ 0m sss 10HmaX-000000005vi-0000 <CALLER@???>
a@???
- 0m 293 10HmaY-000000005vi-0000 <CALLER@???>
+ 0m sss 10HmaY-000000005vi-0000 <CALLER@???>
b@???
- 0m 293 10HmaZ-000000005vi-0000 <CALLER@???>
+ 0m sss 10HmaZ-000000005vi-0000 <CALLER@???>
c@???
- 0m 293 10HmbA-000000005vi-0000 <CALLER@???>
+ 0m sss 10HmbA-000000005vi-0000 <CALLER@???>
d@???
- 0m 293 10HmbB-000000005vi-0000 <CALLER@???>
+ 0m sss 10HmbB-000000005vi-0000 <CALLER@???>
e@???
- 0m 293 10HmbC-000000005vi-0000 <CALLER@???>
+ 0m sss 10HmbC-000000005vi-0000 <CALLER@???>
f@???
- 0m 293 10HmbD-000000005vi-0000 <CALLER@???>
+ 0m sss 10HmbD-000000005vi-0000 <CALLER@???>
g@???
- 0m 293 10HmbE-000000005vi-0000 <CALLER@???>
+ 0m sss 10HmbE-000000005vi-0000 <CALLER@???>
h@???
- 0m 293 10HmbF-000000005vi-0000 <CALLER@???>
+ 0m sss 10HmbF-000000005vi-0000 <CALLER@???>
i@???
- 0m 293 10HmbG-000000005vi-0000 <CALLER@???>
+ 0m sss 10HmbG-000000005vi-0000 <CALLER@???>
j@???
### exim -bpi
diff --git a/test/stdout/0177 b/test/stdout/0177
index f0eaf8553..ca13f65d8 100644
--- a/test/stdout/0177
+++ b/test/stdout/0177
@@ -1,8 +1,8 @@
- 0m 354 10HmbA-000000005vi-0000 <CALLER@???> *** frozen ***
+ 0m sss 10HmbA-000000005vi-0000 <CALLER@???> *** frozen ***
userx@???
+D >usery:userx@???
- 0m 360 10HmbG-000000005vi-0000 <CALLER@???> *** frozen ***
+ 0m sss 10HmbG-000000005vi-0000 <CALLER@???> *** frozen ***
userz@???
diff --git a/test/stdout/0185 b/test/stdout/0185
index e2f3c402d..5a909a1e3 100644
--- a/test/stdout/0185
+++ b/test/stdout/0185
@@ -1,4 +1,4 @@
- 0m 350 10HmaX-000000005vi-0000 <CALLER@???> *** frozen ***
+ 0m sss 10HmaX-000000005vi-0000 <CALLER@???> *** frozen ***
usery@???
diff --git a/test/stdout/0360 b/test/stdout/0360
index 91810eb9b..48f87eb17 100644
--- a/test/stdout/0360
+++ b/test/stdout/0360
@@ -1,4 +1,4 @@
- 0m 295 10HmaX-000000005vi-0000 <CALLER@???>
+ 0m sss 10HmaX-000000005vi-0000 <CALLER@???>
cms@???
+D unknown@???
+D unknown@???
diff --git a/test/stdout/0576 b/test/stdout/0576
index 5fb18e930..5021e089f 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 348 10HmaX-000000005vi-0000 <CALLER@???>
+ 0m sss 10HmaX-000000005vi-0000 <CALLER@???>
normal@???
### alternate q
- 0m 351 10HmaY-000000005vi-0000 <CALLER@???>
+ 0m 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 348 10HmbB-000000005vi-0000 <CALLER@???>
+ 0m sss 10HmbB-000000005vi-0000 <CALLER@???>
normal@???
### alternate q
- 0m 351 10HmbC-000000005vi-0000 <CALLER@???>
+ 0m 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 348 10HmbB-000000005vi-0000 <CALLER@???>
+ 0m sss 10HmbB-000000005vi-0000 <CALLER@???>
normal@???
- 0m 351 10HmbC-000000005vi-0000 <CALLER@???>
+ 0m sss 10HmbC-000000005vi-0000 <CALLER@???>
alternate@???
Message 10HmbB-000000005vi-0000 Message 10HmbC-000000005vi-0000
### default q
- 0m 348 10HmbB-000000005vi-0000 <CALLER@???>
+ 0m sss 10HmbB-000000005vi-0000 <CALLER@???>
normal@???
- 0m 351 10HmbC-000000005vi-0000 <CALLER@???>
+ 0m sss 10HmbC-000000005vi-0000 <CALLER@???>
alternate@???
### alternate q
--
## 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/
