diff options
| author | Todd Lyons <tlyons@exim.org> | 2014-10-22 12:40:33 -0700 |
|---|---|---|
| committer | Todd Lyons <tlyons@exim.org> | 2014-10-22 12:40:33 -0700 |
| commit | 74954688e4f61475b2451b2cb22045ab8e7f0150 (patch) | |
| tree | b4ffaf926c3c4093637fe12f8c2da2b077e16f32 /test/runtest | |
| parent | 37ff4e03734cf28bf78c6df892489f99e50d8356 (diff) | |
| parent | 029f41922c829cd007ec53006076443e38132e64 (diff) | |
Merge branch 'master' of ssh://git.exim.org/home/git/exim
Diffstat (limited to 'test/runtest')
| -rwxr-xr-x | test/runtest | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/runtest b/test/runtest index bfc02eda2..421e0b380 100755 --- a/test/runtest +++ b/test/runtest @@ -541,7 +541,7 @@ RESET_AFTER_EXTRA_LINE_READ: # (this new one is a generic channel-read error, but the testsuite # only hits it in one place) - s/TLS error on connection to \d{1,3}(.\d{1,3}){3} \[\d{1,3}(.\d{1,3}){3}\] \(gnutls_handshake\): Error in the pull function\./a TLS session is required for ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4], but an attempt to start TLS failed/g; + s/TLS error on connection \(gnutls_handshake\): Error in the pull function\./a TLS session is required but an attempt to start TLS failed/g; # (replace old with new, hoping that old only happens in one situation) s/TLS error on connection to \d{1,3}(.\d{1,3}){3} \[\d{1,3}(.\d{1,3}){3}\] \(gnutls_handshake\): A TLS packet with unexpected length was received./a TLS session is required for ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4], but an attempt to start TLS failed/g; @@ -754,7 +754,7 @@ RESET_AFTER_EXTRA_LINE_READ: # numbers, or handle specific bad conditions in different ways, leading to # different wording in the error messages, so we cannot compare them. - s/(TLS error on connection (?:from|to) .*? \(SSL_\w+\): error:)(.*)/$1 <<detail omitted>>/; + s/(TLS error on connection (?:from .* )?\(SSL_\w+\): error:)(.*)/$1 <<detail omitted>>/; # ======== Maildir things ======== # timestamp output in maildir processing |