[exim-cvs] Testsuite: more munging for Alpine Linux

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

Commit:     f5759daf16a28e5b395849b2ce4762f3bb46d3ce
Parent:     27a47076355329d40564a9ac6d39f34d44fc8cbb
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Sun Sep 3 15:48:54 2023 +0100
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Sun Sep 3 15:48:54 2023 +0100

    Testsuite: more munging for Alpine Linux
---
 test/log/1023 | 8 ++++----
 test/runtest  | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/log/1023 b/test/log/1023
index 543ef73c5..ccb765056 100644
--- a/test/log/1023
+++ b/test/log/1023
@@ -1,9 +1,9 @@
-1999-03-02 09:44:33 10HmaX-000000005vi-00 <= CALLER@??? U=CALLER P=local S=sss
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 <= CALLER@??? U=CALLER P=local S=sss
1999-03-02 09:44:33 Start queue run: pid=p1234 -qf
-1999-03-02 09:44:33 10HmaX-000000005vi-00 => user6@??? R=client T=send_to_server2 H=::1 [::1] C="250 OK id=10HmaY-0005vi-00"
-1999-03-02 09:44:33 10HmaX-000000005vi-00 Completed
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 => user6@??? R=client T=send_to_server2 H=::1 [::1] C="250 OK id=10HmaY-000000005vi-0000"
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 Completed
1999-03-02 09:44:33 End queue run: pid=p1234 -qf

 ******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D (IPv6 and IPv4)
-1999-03-02 09:44:33 10HmaY-000000005vi-00 <= CALLER@??? H=the.local.host.name (myhost.test.ex) [ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6] P=esmtp S=sss id=E10HmaX-0005vi-00@???
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 <= CALLER@??? H=the.local.host.name (myhost.test.ex) [ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6] P=esmtp S=sss id=E10HmaX-000000005vi-0000@???
diff --git a/test/runtest b/test/runtest
index 85f4be8a2..204e09e76 100755
--- a/test/runtest
+++ b/test/runtest
@@ -1453,7 +1453,7 @@ RESET_AFTER_EXTRA_LINE_READ:
       s/ \.\.\. >>> / ... /;
       if (s/ non-TFO mode connection attempt to 224.0.0.0, 0 data\b$//) { chomp; $_ .= <IN>; }
       s/Address family not supported by protocol family/Network Error/;
-      s/Network is unreachable/Network Error/;
+      s/Network(?: is)? unreachable/Network Error/;
       }
     next if /^(ppppp |\d+ )?setsockopt FASTOPEN: Protocol not available$/;
     s/^(Connecting to .* \.\.\. sending) \d+ (nonTFO early-data)$/$1 dd $2/;

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