From f5759daf16a28e5b395849b2ce4762f3bb46d3ce Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Sun, 3 Sep 2023 15:48:54 +0100 Subject: 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@myhost.test.ex U=CALLER P=local S=sss +1999-03-02 09:44:33 10HmaX-000000005vi-0000 <= CALLER@myhost.test.ex 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@h2.test.ex 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@h2.test.ex 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@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6] P=esmtp S=sss id=E10HmaX-0005vi-00@myhost.test.ex +1999-03-02 09:44:33 10HmaY-000000005vi-0000 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6] P=esmtp S=sss id=E10HmaX-000000005vi-0000@myhost.test.ex 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; $_ .= ; } 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/; -- cgit v1.2.3