Testsuite - Squashed commit of the following:

commit 7566c531c43298510e080eb8a7ed7cf767f9476b
Author: Jeremy Harris <jgh146exb@wizmail.org>
Date:   Wed Aug 13 16:20:38 2014 +0100

    Assorted OpenSSL cases fail on different library versions. Discard stdout info to hide this.

commit 3d389bc6a5ba0943f1b451fa7a8f2e3246de0bb1
Author: Jeremy Harris <jgh146exb@wizmail.org>
Date:   Wed Aug 13 14:05:19 2014 +0100

    Case 0563 was broken when the GECOS field had spaces. Accept quoted ones in stderr.

commit d4333083f230702c8be45650dc48b6eb65a162eb
Author: Jeremy Harris <jgh146exb@wizmail.org>
Date:   Mon Aug 11 18:30:49 2014 +0100

    Case 0601 was unreliable; perl racing with exim for output. Quieten exim.

diff --git a/test/confs/0601 b/test/confs/0601
index 58b47d517c6f2e0fa037c660ee3378d217001485..84f7d38a610dc3e377d7c6cb50937b63bd1f5403 100644 (file)
--- a/test/confs/0601
+++ b/test/confs/0601
@@ -4,17 +4,12 @@
 exim_path = EXIM_PATH
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
+queue_only
 
 # ----- Main settings -----
 
-acl_smtp_connect = check
+acl_smtp_connect = accept udpsend = <; 127.0.0.1 ; 1223 ; message from exim
+acl_smtp_rcpt = accept
 
 
-# ----- ACL -----
-
-begin acl
-
-check:
-  warn udpsend = <; 127.0.0.1 ; 1223 ; message from exim
-
 # End

diff --git a/test/log/0601 b/test/log/0601
index 1d4157f7ff68ec4c722b6e339a25f83441049368..6f48bb034b37919e3f5be6e05970523858b85739 100644 (file)
--- a/test/log/0601
+++ b/test/log/0601
@@ -1 +1,6 @@
-1999-03-02 09:44:33 U=CALLER rejected connection in "connect" ACL
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local-smtp S=sss
+1999-03-02 09:44:33 10HmaX-0005vi-00 ** CALLER@the.local.host.name: Unrouteable address
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
+1999-03-02 09:44:33 10HmaY-0005vi-00 ** CALLER@the.local.host.name: Unrouteable address
+1999-03-02 09:44:33 10HmaY-0005vi-00 Frozen (delivery error message)
+1999-03-02 09:44:33 10HmaX-0005vi-00 Completed

diff --git a/test/rejectlog/0601 b/test/rejectlog/0601
deleted file mode 100644 (file)
index 1d4157f..0000000
--- a/test/rejectlog/0601
+++ /dev/null
@@ -1 +0,0 @@
-1999-03-02 09:44:33 U=CALLER rejected connection in "connect" ACL

diff --git a/test/runtest b/test/runtest
index 926385f1744819f5c87296debf6883649d198193..a6c4f0acd2d74d3467b44eecbfc8cefc22026f7d 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -560,7 +560,7 @@ RESET_AFTER_EXTRA_LINE_READ:
   s/\buid=$parm_caller_uid\b/uid=CALLER_UID/g;
   s/\bgid=$parm_caller_gid\b/gid=CALLER_GID/g;
 
-  s/\bname=$parm_caller_gecos\b/name=CALLER_GECOS/g;
+  s/\bname="?$parm_caller_gecos"?/name=CALLER_GECOS/g;
 
   # When looking at spool files with -Mvh, we will find not only the caller
   # login, but also the uid and gid. It seems that $) in some Perls gives all
@@ -833,6 +833,11 @@ RESET_AFTER_EXTRA_LINE_READ:
         next;
         }
       }
+
+    # openssl version variances
+    next if /^SSL info: unknown state/;
+    next if /^SSL info: SSLv2\/v3 write client hello A/;
+
     }
 
   # ======== stderr ========

diff --git a/test/scripts/0000-Basic/0601 b/test/scripts/0000-Basic/0601
index c126c06fb77987d2d19a6595f8bbb2e57d7e8d07..8ff09186641533f1ea4c457c5fb3b4dc22a0a7ab 100644 (file)
--- a/test/scripts/0000-Basic/0601
+++ b/test/scripts/0000-Basic/0601
@@ -13,4 +13,5 @@ This is a test message.
 .
 quit
 ***
-sleep 4
+sleep 2
+no_msglog_check

diff --git a/test/stdout/0601 b/test/stdout/0601
index 75968f3de254b74e178005f9954bf067234fc70f..85107ba74119272471677840aae217f13acc3b87 100644 (file)
--- a/test/stdout/0601
+++ b/test/stdout/0601
@@ -1,2 +1,7 @@
+220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 received:  message from exim
-550 Administrative prohibition\r
+250 OK\r
+250 Accepted\r
+354 Enter message, ending with "." on a line by itself\r
+250 OK id=10HmaX-0005vi-00\r
+221 the.local.host.name closing connection\r

diff --git a/test/stdout/2102 b/test/stdout/2102
index 77ae109b2b0c2a8ec44655b1cb5276dc5a45021b..56c47f8b3d2bac38eca1544a5b01c0f14ca55b67 100644 (file)
--- a/test/stdout/2102
+++ b/test/stdout/2102
@@ -20,7 +20,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
 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 key exchange A
@@ -74,7 +73,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
 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 key exchange A
@@ -128,7 +126,6 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
 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 key exchange A
@@ -168,7 +165,6 @@ Key file = TESTSUITE/aux-fixed/exim-ca/example.com/server2.example.com/server2.e
 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 key exchange A

diff --git a/test/stdout/2103 b/test/stdout/2103
index 1c2f41881d8359737c401a8da09aafe677304e95..d7d74becab0023dee321eadf8be3d61e8dffd00e 100644 (file)
--- a/test/stdout/2103
+++ b/test/stdout/2103
@@ -20,7 +20,6 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
 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 key exchange A
@@ -67,7 +66,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
 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 key exchange A

diff --git a/test/stdout/2105 b/test/stdout/2105
index a9eb350be725af0891096b397168c33069fe4168..457921c41c076604745a8cde2cf0dc4d47463ecb 100644 (file)
--- a/test/stdout/2105
+++ b/test/stdout/2105
@@ -26,7 +26,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
 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 key exchange A

diff --git a/test/stdout/2106 b/test/stdout/2106
index cae6e21c84f0d61f412fdfa13c8b38a27d20d960..576eef83f01a18dd0f4ca903288571b744d22ca1 100644 (file)
--- a/test/stdout/2106
+++ b/test/stdout/2106
@@ -20,7 +20,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
 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 key exchange A

diff --git a/test/stdout/2114 b/test/stdout/2114
index 35a69691518aae0da32afce57bba34e7f5cb8e61..c0c698b22a69b7643a2a0fae328dbf02cfb060f0 100644 (file)
--- a/test/stdout/2114
+++ b/test/stdout/2114
@@ -20,7 +20,6 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
 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 key exchange A
@@ -58,7 +57,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
 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 key exchange A
@@ -112,7 +110,6 @@ Key file = aux-fixed/cert2
 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 key exchange A
@@ -164,7 +161,6 @@ Key file = aux-fixed/cert2
 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 key exchange A
@@ -216,7 +212,6 @@ Key file = aux-fixed/cert1
 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 key exchange A
@@ -257,7 +252,6 @@ Key file = aux-fixed/cert1
 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 key exchange A
@@ -311,7 +305,6 @@ Key file = aux-fixed/cert2
 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 key exchange A
@@ -352,7 +345,6 @@ Key file = aux-fixed/cert1
 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 key exchange A

diff --git a/test/stdout/2118 b/test/stdout/2118
index 1709dee8aeca4d1d732d9a6db6593221e862dc9e..fa74b6c51f42d1d37626e1260ddee4dc173524a0 100644 (file)
--- a/test/stdout/2118
+++ b/test/stdout/2118
@@ -20,7 +20,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
 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 key exchange A

diff --git a/test/stdout/2119 b/test/stdout/2119
index 0bcff273bcb087df4af4d681d99f5defbf849ca0..a5c4882269aa32cde3e7d8efee56e1bd63ceb9de 100644 (file)
--- a/test/stdout/2119
+++ b/test/stdout/2119
@@ -2,7 +2,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
 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 key exchange A
@@ -53,7 +52,6 @@ Key file = aux-fixed/cert2
 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 key exchange A

diff --git a/test/stdout/2122 b/test/stdout/2122
index 4bb92703285fe1ca28c48921a39c449f8eb049e1..8da07cd8926257798cc2da9ad0c756f08dcd6bdf 100644 (file)
--- a/test/stdout/2122
+++ b/test/stdout/2122
@@ -20,7 +20,6 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
 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 key exchange A

diff --git a/test/stdout/2124 b/test/stdout/2124
index d2d83d5b6eb0afe6a45c8a621e3dbf516a7a2431..d1e0f21374b19934f38187623e6f5c54825cc114 100644 (file)
--- a/test/stdout/2124
+++ b/test/stdout/2124
@@ -22,7 +22,6 @@ Key file = aux-fixed/cert2
 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 key exchange A

diff --git a/test/stdout/2128 b/test/stdout/2128
index 795f469d1e4614c64bba9655559723b5d1b62a73..65457b9244ae1c56fe277a35c8b25a5ee12b4a02 100644 (file)
--- a/test/stdout/2128
+++ b/test/stdout/2128
@@ -20,7 +20,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
 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 key exchange A
@@ -43,7 +42,6 @@ Connecting to 127.0.0.1 port 1226 ... connected
 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 key exchange A

diff --git a/test/stdout/2150 b/test/stdout/2150
index 2f55964999625e0fa0b4f52bc606b86977703422..6601866c91fddb45a561925a9ff574a97e44ec25 100644 (file)
--- a/test/stdout/2150
+++ b/test/stdout/2150
@@ -20,7 +20,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
 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 key exchange A

diff --git a/test/stdout/3460 b/test/stdout/3460
index 92c47970f9bbdd497181d908973c692c7ecd2413..b9dc4ef50fe8a0bc966b7f0557c5e133622187b1 100644 (file)
--- a/test/stdout/3460
+++ b/test/stdout/3460
@@ -50,7 +50,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
 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 key exchange A

diff --git a/test/stdout/3463 b/test/stdout/3463
index 68b1b55c0fe7f843f2afcacebb3adf3d276ca608..d1c8d2aa6afd6464f67628e8995959463a5c7462 100644 (file)
--- a/test/stdout/3463
+++ b/test/stdout/3463
@@ -22,7 +22,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
 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 key exchange A
@@ -71,7 +70,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
 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 key exchange A

diff --git a/test/stdout/3464 b/test/stdout/3464
index 46f1c37298bc3312fbf8df4de0fae9e817b0da88..2b900a3e1e00f01b1a5c736ceacae80bb24fff75 100644 (file)
--- a/test/stdout/3464
+++ b/test/stdout/3464
@@ -22,7 +22,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
 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 key exchange A
@@ -65,7 +64,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
 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 key exchange A

diff --git a/test/stdout/5600 b/test/stdout/5600
index 9020be17e69601cb4601f65300286ee7293a83b4..7c6a458ab31b0934eb5ead18f9062b412fcee345 100644 (file)
--- a/test/stdout/5600
+++ b/test/stdout/5600
@@ -22,11 +22,9 @@ Key file = aux-fixed/cert2
 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
 Response verify OK
-SSL info: unknown state
 SSL info: SSLv3 read server key exchange A
 SSL info: SSLv3 read server certificate request A
 SSL info: SSLv3 read server done A
@@ -76,7 +74,6 @@ Key file = aux-fixed/cert2
 Attempting to start TLS
 SSL info: before/connect initialization
 SSL info: before/connect initialization
-SSL info: SSLv2/v3 write client hello A
 no response received
 SSL info: SSLv3 read server hello A
 SSL info: SSLv3 read server certificate A
@@ -120,7 +117,6 @@ Key file = aux-fixed/cert2
 Attempting to start TLS
 SSL info: before/connect initialization
 SSL info: before/connect initialization
-SSL info: SSLv2/v3 write client hello A
 no response received
 SSL info: SSLv3 read server hello A
 SSL info: SSLv3 read server certificate A