From c562fd30c03126dd72d76ec43842d9d00fcd8bf3 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Thu, 25 Sep 2014 22:20:33 +0100 Subject: More regular logging use of H= [] Note this may affect utilities which parse logs. --- test/runtest | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'test/runtest') 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 <>/; + s/(TLS error on connection (?:from .* )?\(SSL_\w+\): error:)(.*)/$1 <>/; # ======== Maildir things ======== # timestamp output in maildir processing -- cgit v1.2.3