diff options
| -rwxr-xr-x | test/runtest | 4 | ||||
| -rw-r--r-- | test/scripts/0000-Basic/0388 | 1 | ||||
| -rw-r--r-- | test/stderr/0388 | 2 |
3 files changed, 2 insertions, 5 deletions
diff --git a/test/runtest b/test/runtest index 53fccf439..b8e97024d 100755 --- a/test/runtest +++ b/test/runtest @@ -1080,6 +1080,7 @@ RESET_AFTER_EXTRA_LINE_READ: { $_ .= <IN>; s/ \.\.\. >>> / ... /; + s/Network is unreachable/Network Error/; } next if /^(ppppp )?setsockopt FASTOPEN: Protocol not available$/; @@ -1497,9 +1498,6 @@ $munges = 'timeout_errno' => # actual errno differs Solaris vs. Linux { 'mainlog' => 's/(host deferral .* errno) <\d+> /$1 <EEE> /' }, - - 'net_unreach' => # platforms not supporting TCP Fast Open difference - { 'stderr' => 's/failed: Network Error/failed: Network is unreachanble/' }, }; diff --git a/test/scripts/0000-Basic/0388 b/test/scripts/0000-Basic/0388 index a451ec7b6..ec2d798fd 100644 --- a/test/scripts/0000-Basic/0388 +++ b/test/scripts/0000-Basic/0388 @@ -1,6 +1,5 @@ # Recipient errors and hosts_max_try need_ipv4 -munge net_unreach # exim -odq x@y **** diff --git a/test/stderr/0388 b/test/stderr/0388 index 399edd821..92b3f23e1 100644 --- a/test/stderr/0388 +++ b/test/stderr/0388 @@ -112,7 +112,7 @@ returned from EXIM_DBOPEN no retry data available V4NET.0.0.0 in serialize_hosts? no (option unset) set_process_info: pppp delivering 10HmaX-0005vi-00 to V4NET.0.0.0 [V4NET.0.0.0] (x@y) -Connecting to V4NET.0.0.0 [V4NET.0.0.0]:1224 ... failed: Network is unreachable +Connecting to V4NET.0.0.0 [V4NET.0.0.0]:1224 ... failed: Network Error LOG: MAIN H=V4NET.0.0.0 [V4NET.0.0.0] Network Error set_process_info: pppp delivering 10HmaX-0005vi-00: just tried V4NET.0.0.0 [V4NET.0.0.0] for x@y: result DEFER |