From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Sat, 29 Nov 2014 19:05:28 +0000 (+0000)
Subject: Testsuite: treat ECONNRESET the same as ECONNREFUSED on the new connection
X-Git-Tag: exim-4_85_RC2~4
X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/7f8794a2c5abf4501cc05c460c9fa290ad2f6aa2?ds=sidebyside

Testsuite: treat ECONNRESET the same as ECONNREFUSED on the new connection
---

diff --git a/test/runtest b/test/runtest
index 9fd818879..3ca9a67cb 100755
--- a/test/runtest
+++ b/test/runtest
@@ -491,6 +491,9 @@ RESET_AFTER_EXTRA_LINE_READ:
   s/Exim\sstatistics\sfrom\s\d{4}-\d\d-\d\d\s\d\d:\d\d:\d\d\sto\s
     \d{4}-\d\d-\d\d\s\d\d:\d\d:\d\d/Exim statistics from <time> to <time>/x;
 
+  # Treat ECONNRESET the same as ECONNREFUSED.  At least some systems give
+  # us the former on a new connection.
+  s/(could not connect to .*: Connection) reset by peer$/$1 refused/;
 
   # ======== TLS certificate algorithms ========
   # Test machines might have various different TLS library versions supporting
@@ -1683,7 +1686,7 @@ if (/^dump\s+(\S+)/)
 
     foreach $item (@temp)
       {
-      $item =~ s/^\s*(.*)\n(.*)\n?\s*$/\1\n\2/m;
+      $item =~ s/^\s*(.*)\n(.*)\n?\s*$/$1\n$2/m;
       print OUT "  $item\n";
       }
     }