[exim-cvs] Testsuite: treat ECONNRESET the same as ECONNREFU…

Gitweb: http://git.exim.org/exim.git/commitdiff/7f8794a2c5abf4501cc05c460c9fa290ad2f6aa2

Commit:     7f8794a2c5abf4501cc05c460c9fa290ad2f6aa2
Parent:     8e31060fdfbc906426ae1bfc9de274a2aa93b53a
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Sat Nov 29 19:05:28 2014 +0000
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Sat Nov 29 19:05:28 2014 +0000

    Testsuite: treat ECONNRESET the same as ECONNREFUSED on the new connection
---
 test/runtest |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/test/runtest b/test/runtest
index 9fd8188..3ca9a67 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";
       }
     }