diff options
Diffstat (limited to 'test')
| -rwxr-xr-x | test/runtest | 28 | ||||
| -rw-r--r-- | test/stderr/0227 | 1 | ||||
| -rw-r--r-- | test/stderr/0376 | 2 | ||||
| -rw-r--r-- | test/stderr/0473 | 2 | ||||
| -rw-r--r-- | test/stderr/0578 | 2 |
5 files changed, 32 insertions, 3 deletions
diff --git a/test/runtest b/test/runtest index a9927475e..bd0b9859b 100755 --- a/test/runtest +++ b/test/runtest @@ -492,10 +492,10 @@ RESET_AFTER_EXTRA_LINE_READ: # time used was fixed when I first started running automatic Exim tests. # Date/time in header lines and SMTP responses - s/[A-Z][a-z]{2},\s\d\d?\s[A-Z][a-z]{2}\s\d\d\d\d\s\d\d\:\d\d:\d\d\s[-+]\d{4} + s/[A-Z][a-z]{2},\s\d\d?\s[A-Z][a-z]{2}\s\d{4}\s\d\d\:\d\d:\d\d\s[-+]\d{4} /Tue, 2 Mar 1999 09:44:33 +0000/gx; # and in a French locale - s/\S{4},\s\d\d?\s[^,]+\s\d\d\d\d\s\d\d\:\d\d:\d\d\s[-+]\d{4} + s/\S{4},\s\d\d?\s[^,]+\s\d{4}\s\d\d\:\d\d:\d\d\s[-+]\d{4} /dim., 10 f\xE9vr 2019 20:05:49 +0000/gx; # Date/time in logs and in one instance of a filter test @@ -1208,7 +1208,7 @@ RESET_AFTER_EXTRA_LINE_READ: next if /^PDKIM \[[^[]+\] (Header hash|b) computed:/; # Not all platforms support TCP Fast Open, and the compile omits the check - if (s/\S+ in hosts_try_fastopen\? no \(option unset\)\n$//) + if (s/\S+ in hosts_try_fastopen\? (no \(option unset\)|yes \(matched "\*"\))\n$//) { $_ .= <IN>; s/ \.\.\. >>> / ... /; @@ -1218,6 +1218,28 @@ RESET_AFTER_EXTRA_LINE_READ: next if /^(ppppp )?setsockopt FASTOPEN: Protocol not available$/; s/^(Connecting to .* \.\.\. sending) \d+ (nonTFO early-data)$/$1 dd $2/; + if (/^([0-9: ]*Connecting to [^ ]+ [^ ]+( from [^ ]+)?) \.\.\. .*TFO mode sendto, no data: EINPROGRESS$/) + { + $_ = $1 . " ... " . <IN>; + s/^(.* \.\.\.) [0-9: ]*connected$/$1 connected/; + + if (/^Connecting to .* \.\.\. connected$/) + { + $_ .= <IN>; + if (/^(Connecting to .* \.\.\. )connected\n\s+SMTP(\(close\)>>|\(Connection refused\)<<)$/) + { + $_ = $1 . "failed: Connection refused\n" . <IN>; + s/^(Connecting .*)\n\s+SMTP\(close\)>>$/$1/; + } + elsif (/^(Connecting to .* \.\.\. connected\n)read response data: size=/) + { $_ = $1; } + + # Date/time in SMTP banner + s/[A-Z][a-z]{2},\s\d\d?\s[A-Z][a-z]{2}\s\d{4}\s\d\d\:\d\d:\d\d\s[-+]\d{4} + /Tue, 2 Mar 1999 09:44:33 +0000/gx; + } + } + # Specific pointer values reported for DB operations change from run to run s/^(\s*returned from EXIM_DBOPEN: )(0x)?[0-9a-f]+/${1}0xAAAAAAAA/; s/^(\s*EXIM_DBCLOSE.)(0x)?[0-9a-f]+/${1}0xAAAAAAAA/; diff --git a/test/stderr/0227 b/test/stderr/0227 index e1f008976..4fd9d54ec 100644 --- a/test/stderr/0227 +++ b/test/stderr/0227 @@ -317,6 +317,7 @@ LOG: smtp_connection MAIN LOG: smtp_connection MAIN SMTP connection from root Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected + SMTP(closed)<< SMTP(close)>> LOG: MAIN REJECT H=[V4NET.0.0.1] U=root sender verify defer for <bad@localhost1>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Remote host closed connection in response to initial connection diff --git a/test/stderr/0376 b/test/stderr/0376 index d08f4302e..334af5a9e 100644 --- a/test/stderr/0376 +++ b/test/stderr/0376 @@ -655,6 +655,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP>> MAIL FROM:<> SMTP<< 250 OK SMTP>> RCPT TO:<myhost.test.ex-dddddddd-testing@otherhost51> + SMTP(Connection timed out)<< SMTP timeout SMTP(close)>> wrote callout cache domain record for otherhost51: @@ -760,6 +761,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP>> MAIL FROM:<> SMTP<< 250 OK SMTP>> RCPT TO:<abcd@x.y.z> + SMTP(Connection timed out)<< SMTP timeout SMTP(close)>> wrote callout cache domain record for x.y.z: diff --git a/test/stderr/0473 b/test/stderr/0473 index 65a39a9b7..2ab1628a4 100644 --- a/test/stderr/0473 +++ b/test/stderr/0473 @@ -19,6 +19,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP>> MAIL FROM:<> SMTP<< 250 OK SMTP>> RCPT TO:<r11@two.test.ex> + SMTP(Connection timed out)<< SMTP timeout SMTP(close)>> wrote callout cache domain record for two.test.ex: @@ -43,6 +44,7 @@ callout cache: found domain record for two.test.ex callout cache: no address record found for r11@two.test.ex interface=NULL port=1224 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected + SMTP(Connection timed out)<< SMTP(close)>> SMTP timeout LOG: MAIN REJECT diff --git a/test/stderr/0578 b/test/stderr/0578 index 54ccc563c..55525fc65 100644 --- a/test/stderr/0578 +++ b/test/stderr/0578 @@ -685,6 +685,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP>> MAIL FROM:<> SMTP>> RCPT TO:<myhost.test.ex-dddddddd-testing@otherhost51> SMTP<< 250 OK + SMTP(Connection timed out)<< SMTP timeout SMTP(close)>> wrote callout cache domain record for otherhost51: @@ -796,6 +797,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP>> MAIL FROM:<> SMTP>> RCPT TO:<abcd@x.y.z> SMTP<< 250 OK + SMTP(Connection timed out)<< SMTP timeout SMTP(close)>> wrote callout cache domain record for x.y.z: |