diff options
| -rw-r--r-- | test/log/0021 | 2 | ||||
| -rw-r--r-- | test/log/0552 | 6 | ||||
| -rw-r--r-- | test/rejectlog/0021 | 2 | ||||
| -rwxr-xr-x | test/runtest | 6 | ||||
| -rw-r--r-- | test/scripts/2100-OpenSSL/2150 | 2 | ||||
| -rw-r--r-- | test/stdout/2122 | 2 | ||||
| -rw-r--r-- | test/stdout/2150 | 14 |
7 files changed, 24 insertions, 10 deletions
diff --git a/test/log/0021 b/test/log/0021 index 39eb9610d..d8dee8002 100644 --- a/test/log/0021 +++ b/test/log/0021 @@ -43,7 +43,7 @@ 1999-03-02 09:44:33 H=(test.ex) [10.9.8.8] U=CALLER Warning: This warning is from a HELO ACL (command ehlo test.ex) 1999-03-02 09:44:33 ACL "warn" with "message" setting found in a non-message (EHLO or HELO) ACL: cannot specify header lines here: message ignored 1999-03-02 09:44:33 H=(test.ex) [10.9.8.8] U=CALLER rejected EHLO or HELO test.ex -1999-03-02 09:44:33 mail accepted "mail from: <ok@test3> SIZE=1234" "<ok@test3> SIZE=1234" +1999-03-02 09:44:33 mail accepted "mail from: <ok@test3> SIZE=ssss" "<ok@test3> SIZE=1234" 1999-03-02 09:44:33 10HmbK-0005vi-00 <= ok@test3 H=[10.9.8.8] U=CALLER P=smtp S=sss 1999-03-02 09:44:33 10HmbK-0005vi-00 => x <x@y> R=accept T=appendfile 1999-03-02 09:44:33 10HmbK-0005vi-00 Completed diff --git a/test/log/0552 b/test/log/0552 index e5a1fd831..de765949d 100644 --- a/test/log/0552 +++ b/test/log/0552 @@ -1,9 +1,9 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 Accept non-SMTP 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 Start queue run: pid=pppp -qf -1999-03-02 09:44:33 10HmaX-0005vi-00 == userx1@test.ex R=r1 T=t1 defer (dd): Connection timed out: SMTP timeout while connected to 127.0.0.1 [127.0.0.1] after MAIL FROM:<CALLER@myhost.test.ex> SIZE=1310 -1999-03-02 09:44:33 10HmaX-0005vi-00 == userx2@test.ex R=r1 T=t1 defer (dd): Connection timed out: SMTP timeout while connected to 127.0.0.1 [127.0.0.1] after MAIL FROM:<CALLER@myhost.test.ex> SIZE=1310 -1999-03-02 09:44:33 10HmaX-0005vi-00 == userx3@test.ex R=r1 T=t1 defer (dd): Connection timed out: SMTP timeout while connected to 127.0.0.1 [127.0.0.1] after MAIL FROM:<CALLER@myhost.test.ex> SIZE=1310 +1999-03-02 09:44:33 10HmaX-0005vi-00 == userx1@test.ex R=r1 T=t1 defer (dd): Connection timed out: SMTP timeout while connected to 127.0.0.1 [127.0.0.1] after MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss +1999-03-02 09:44:33 10HmaX-0005vi-00 == userx2@test.ex R=r1 T=t1 defer (dd): Connection timed out: SMTP timeout while connected to 127.0.0.1 [127.0.0.1] after MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss +1999-03-02 09:44:33 10HmaX-0005vi-00 == userx3@test.ex R=r1 T=t1 defer (dd): Connection timed out: SMTP timeout while connected to 127.0.0.1 [127.0.0.1] after MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss 1999-03-02 09:44:33 End queue run: pid=pppp -qf 1999-03-02 09:44:33 Start queue run: pid=pppp -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx1@test.ex R=r1 T=t1 H=127.0.0.1 [127.0.0.1] diff --git a/test/rejectlog/0021 b/test/rejectlog/0021 index 8fdad8e45..edfe63fe9 100644 --- a/test/rejectlog/0021 +++ b/test/rejectlog/0021 @@ -56,4 +56,4 @@ I Message-Id: <E10HmbB-0005vi-00@myhost.test.ex> F From: userx@test1 Date: Tue, 2 Mar 1999 09:44:33 +0000 1999-03-02 09:44:33 H=(test.ex) [10.9.8.8] U=CALLER rejected EHLO or HELO test.ex -1999-03-02 09:44:33 mail accepted "mail from: <ok@test3> SIZE=1234" "<ok@test3> SIZE=1234" +1999-03-02 09:44:33 mail accepted "mail from: <ok@test3> SIZE=ssss" "<ok@test3> SIZE=1234" diff --git a/test/runtest b/test/runtest index 472aeaf78..775f658e2 100755 --- a/test/runtest +++ b/test/runtest @@ -1,6 +1,6 @@ #! /usr/bin/perl -w -# $Cambridge: exim/test/runtest,v 1.25 2007/03/14 12:15:56 ph10 Exp $ +# $Cambridge: exim/test/runtest,v 1.26 2007/04/17 13:05:41 ph10 Exp $ ############################################################################### # This is the controlling script for the "new" test suite for Exim. It should # @@ -23,7 +23,7 @@ use Socket; # Start by initializing some global variables -$testversion = "4.67 (15-Jan-07)"; +$testversion = "4.67 (16-Apr-07)"; $cf = "bin/cf"; $cr = "\r"; @@ -588,7 +588,7 @@ while(<IN>) s/([\s,])S=\d+\b/$1S=sss/; s/:S\d+\b/:Ssss/; s/^(\s*\d+m\s+)\d+(\s+[a-z0-9-]{16} <)/$1sss$2/i if $is_stdout; - s/\sSIZE=\d+\b/ SIZE=ssss/ if $is_stderr || $is_stdout; + s/\sSIZE=\d+\b/ SIZE=ssss/; s/\ssize=\d+\b/ size=sss/ if $is_stderr; s/old size = \d+\b/old size = sssss/; s/message size = \d+\b/message size = sss/; diff --git a/test/scripts/2100-OpenSSL/2150 b/test/scripts/2100-OpenSSL/2150 index 91cd38276..3b63f14b4 100644 --- a/test/scripts/2100-OpenSSL/2150 +++ b/test/scripts/2100-OpenSSL/2150 @@ -4,7 +4,7 @@ exim -DSERVER=server -bd -oX PORT_D # The pause (+++ 1) at the end of this is so that we don't close the input # until some time after sending the dot. # -client-gnutls 127.0.0.1 PORT_D +client-ssl 127.0.0.1 PORT_D ??? 220 ehlo abcd ??? 250- diff --git a/test/stdout/2122 b/test/stdout/2122 index 90f949d15..2346eecf0 100644 --- a/test/stdout/2122 +++ b/test/stdout/2122 @@ -35,7 +35,7 @@ Succeeded in starting TLS ??? 214- <<< 214-Commands supported: ??? 214 -<<< 214 AUTH STARTTLS HELO EHLO MAIL RCPT DATA NOOP QUIT RSET HELP +<<< 214 AUTH HELO EHLO MAIL RCPT DATA NOOP QUIT RSET HELP >>> quit ??? 221 <<< 221 myhost.test.ex closing connection diff --git a/test/stdout/2150 b/test/stdout/2150 index 1efa5cd7c..90656fdcd 100644 --- a/test/stdout/2150 +++ b/test/stdout/2150 @@ -16,6 +16,20 @@ Connecting to 127.0.0.1 port 1225 ... connected ??? 220 <<< 220 TLS go ahead Attempting to start TLS +SSL info: before/connect initialization +SSL info: before/connect initialization +SSL info: SSLv2/v3 write client hello A +SSL info: SSLv3 read server hello A +SSL info: SSLv3 read server certificate A +SSL info: SSLv3 read server done A +SSL info: SSLv3 write client key exchange A +SSL info: SSLv3 write change cipher spec A +SSL info: SSLv3 write finished A +SSL info: SSLv3 flush data +SSL info: SSLv3 read finished A +SSL info: SSL negotiation finished successfully +SSL info: SSL negotiation finished successfully +SSL connection using AES256-SHA Succeeded in starting TLS >>> mail from:<userx@test.ex> ??? 250 |