[exim-cvs] cvs commit: exim/exim-test runtest exim/exim-test…

Top Page
Delete this message
Reply to this message
Author: Philip Hazel
Date:  
To: exim-cvs
Subject: [exim-cvs] cvs commit: exim/exim-test runtest exim/exim-test/log 0021 0552 exim/exim-test/rejectlog 0021 exim/exim-test/scripts/2100-OpenSSL 2150 exim/exim-test/stdout 2122 2150
ph10 2007/04/17 14:05:42 BST

  Modified files:
    exim-test            runtest 
    exim-test/log        0021 0552 
    exim-test/rejectlog  0021 
    exim-test/scripts/2100-OpenSSL 2150 
    exim-test/stdout     2122 2150 
  Log:
  Test suite portability updates.


  Revision  Changes    Path
  1.4       +1 -1      exim/exim-test/log/0021
  1.2       +3 -3      exim/exim-test/log/0552
  1.4       +1 -1      exim/exim-test/rejectlog/0021
  1.26      +2 -2      exim/exim-test/runtest
  1.3       +1 -1      exim/exim-test/scripts/2100-OpenSSL/2150
  1.2       +1 -1      exim/exim-test/stdout/2122
  1.3       +14 -0     exim/exim-test/stdout/2150


  Index: runtest
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/runtest,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- runtest    14 Mar 2007 12:15:56 -0000    1.25
  +++ runtest    17 Apr 2007 13:05:41 -0000    1.26
  @@ -1,6 +1,6 @@
   #! /usr/bin/perl -w


-# $Cambridge: exim/exim-test/runtest,v 1.25 2007/03/14 12:15:56 ph10 Exp $
+# $Cambridge: exim/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 @@

# 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 @@
     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/;


  Index: 0021
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/log/0021,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- 0021    20 Feb 2007 11:37:16 -0000    1.3
  +++ 0021    17 Apr 2007 13:05:41 -0000    1.4
  @@ -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


  Index: 0552
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/log/0552,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0552    5 Feb 2007 12:35:47 -0000    1.1
  +++ 0552    17 Apr 2007 13:05:41 -0000    1.2
  @@ -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@??? 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@??? 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@???> SIZE=1310
  -1999-03-02 09:44:33 10HmaX-0005vi-00 == userx2@??? 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@???> SIZE=1310
  -1999-03-02 09:44:33 10HmaX-0005vi-00 == userx3@??? 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@???> SIZE=1310
  +1999-03-02 09:44:33 10HmaX-0005vi-00 == userx1@??? 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@???> SIZE=ssss
  +1999-03-02 09:44:33 10HmaX-0005vi-00 == userx2@??? 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@???> SIZE=ssss
  +1999-03-02 09:44:33 10HmaX-0005vi-00 == userx3@??? 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@???> 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@??? R=r1 T=t1 H=127.0.0.1 [127.0.0.1]


  Index: 0021
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/rejectlog/0021,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- 0021    20 Feb 2007 11:37:17 -0000    1.3
  +++ 0021    17 Apr 2007 13:05:41 -0000    1.4
  @@ -56,4 +56,4 @@
   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"


  Index: 2150
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/scripts/2100-OpenSSL/2150,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 2150    16 Apr 2007 10:31:58 -0000    1.2
  +++ 2150    17 Apr 2007 13:05:42 -0000    1.3
  @@ -4,7 +4,7 @@
   # 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-


  Index: 2122
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stdout/2122,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 2122    7 Feb 2006 10:47:37 -0000    1.1
  +++ 2122    17 Apr 2007 13:05:42 -0000    1.2
  @@ -35,7 +35,7 @@
   ??? 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


  Index: 2150
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stdout/2150,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 2150    16 Apr 2007 10:31:58 -0000    1.2
  +++ 2150    17 Apr 2007 13:05:42 -0000    1.3
  @@ -16,6 +16,20 @@
   ??? 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@???>
   ??? 250