Gitweb:
https://git.exim.org/exim.git/commitdiff/5f5708ef4a2dfb3517de853b90b23ff4cc66a3c0
Commit: 5f5708ef4a2dfb3517de853b90b23ff4cc66a3c0
Parent: 49692970941920d8108ce775d483ec1c245222f0
Author: Jeremy Harris <jgh146exb@???>
AuthorDate: Sat Jul 20 15:25:23 2019 +0100
Committer: Jeremy Harris <jgh146exb@???>
CommitDate: Sat Jul 20 16:13:55 2019 +0100
Testsuite: synch log output
---
test/confs/0460 | 2 ++
test/log/0460 | 11 ++++++-----
test/log/2002 | 3 ++-
test/scripts/0000-Basic/0460 | 6 +++---
test/scripts/2000-GnuTLS/2002 | 29 ++++++++++++++++++++++-------
test/stdout/2002 | 15 +++++++++------
6 files changed, 44 insertions(+), 22 deletions(-)
diff --git a/test/confs/0460 b/test/confs/0460
index 52628ab..6c6ec74 100644
--- a/test/confs/0460
+++ b/test/confs/0460
@@ -8,6 +8,8 @@ primary_hostname = myhost.test.ex
# ----- Main settings -----
qualify_domain = test.ex
+queue_only
+queue_run_in_order
acl_smtp_rcpt = accept
diff --git a/test/log/0460 b/test/log/0460
index 146072f..06a6ffa 100644
--- a/test/log/0460
+++ b/test/log/0460
@@ -1,10 +1,11 @@
-**NOTE: The delivery lines in this file have been sorted.
+1999-03-02 09:44:33 Start queue run: pid=pppp -qf
+1999-03-02 09:44:33 10HmaX-0005vi-00 => userx <userx@???> R=r1 T=t1
+1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
+1999-03-02 09:44:33 10HmaY-0005vi-00 => userx <userx@???> R=r1 T=t1
+1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
+1999-03-02 09:44:33 End queue run: pid=pppp -qf
******** SERVER ********
1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
1999-03-02 09:44:33 10HmaX-0005vi-00 <= userx@??? H=(rhu.barb) [127.0.0.1] P=esmtp S=sss
1999-03-02 09:44:33 10HmaY-0005vi-00 <= userx@??? H=(rhu.barb) [127.0.0.1] P=esmtp S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 => userx <userx@???> R=r1 T=t1
-1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaY-0005vi-00 => userx <userx@???> R=r1 T=t1
-1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
diff --git a/test/log/2002 b/test/log/2002
index 9343c37..825c0df 100644
--- a/test/log/2002
+++ b/test/log/2002
@@ -19,6 +19,8 @@
1999-03-02 09:44:33 Our cert SN: <CN=server1.example.com>
1999-03-02 09:44:33 Peer did not present a cert
1999-03-02 09:44:33 10HmaY-0005vi-00 <= "name with spaces"@??? H=[127.0.0.1] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss
+1999-03-02 09:44:33 TLS error on connection from (rhu.barb) [ip4.ip4.ip4.ip4] (gnutls_handshake): The peer did not send any certificate.
+1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
1999-03-02 09:44:33 Our cert SN: <CN=server1.example.com>
1999-03-02 09:44:33 Peer cert:
1999-03-02 09:44:33 ver 3
@@ -46,4 +48,3 @@
1999-03-02 09:44:33 Our cert SN: <CN=server1.example_ec.com>
1999-03-02 09:44:33 Peer did not present a cert
1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@??? H=[127.0.0.1] P=smtps X=TLS1.x:ke-ECDSA-AES256-SHAnnn:xxx CV=no S=sss
-1999-03-02 09:44:33 TLS error on connection from (rhu.barb) [ip4.ip4.ip4.ip4] (gnutls_handshake): The peer did not send any certificate.
diff --git a/test/scripts/0000-Basic/0460 b/test/scripts/0000-Basic/0460
index beb4e00..953641b 100644
--- a/test/scripts/0000-Basic/0460
+++ b/test/scripts/0000-Basic/0460
@@ -43,6 +43,6 @@ QUIT
??? 221
****
killdaemon
-# Wait for delivery process
-sleep 1
-sortlog
+# drain the queue
+exim -qf
+****
diff --git a/test/scripts/2000-GnuTLS/2002 b/test/scripts/2000-GnuTLS/2002
index 1cfc293..c96ffa1 100644
--- a/test/scripts/2000-GnuTLS/2002
+++ b/test/scripts/2000-GnuTLS/2002
@@ -59,19 +59,29 @@ This is a test encrypted message.
quit
??? 221
****
-# Server asks for a client cert (?but client does not supply one?)
+#
+# Server asks for a client cert but client does not supply one
client-gnutls -p NONE:+SIGN-RSA-SHA256:+SIGN-ECDSA-SHA512:+VERS-TLS1.2:+ECDHE-RSA:+DHE-RSA:+RSA:+CIPHER-ALL:+MAC-ALL:+COMP-NULL:+CURVE-ALL:+CTYPE-X509 HOSTIPV4 PORT_D
??? 220
ehlo rhu.barb
??? 250-
-??? 250-
-??? 250-
-??? 250-
-??? 250-
-??? 250
+??? 250-SIZE
+??? 250-8BITMIME
+??? 250-PIPELINING
+??? 250-STARTTLS
+??? 250 HELP
starttls
-??? 220
+??? 220 TLS go ahead
+nop
+???*
****
+# ensure sequence of log TLS error line
+killdaemon
+sleep 1
+exim -DSERVER=server -bd -oX PORT_D
+****
+#
+#
# Server asks for a client cert, and one is given which is verifiable by the server
client-gnutls -p NONE:+SIGN-RSA-SHA256:+SIGN-ECDSA-SHA512:+VERS-TLS1.2:+ECDHE-RSA:+DHE-RSA:+RSA:+CIPHER-ALL:+MAC-ALL:+COMP-NULL:+CURVE-ALL:+CTYPE-X509 HOSTIPV4 PORT_D DIR/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.pem DIR/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.unlocked.key
??? 220
@@ -155,8 +165,13 @@ quit
??? 221
****
killdaemon
+sleep 1
+# clear out the queue
exim -qf
****
+sleep 1
+#
+# STARTTLS used when not advertised
exim -bh 10.0.0.1
starttls
quit
diff --git a/test/stdout/2002 b/test/stdout/2002
index 7462793..276c903 100644
--- a/test/stdout/2002
+++ b/test/stdout/2002
@@ -80,22 +80,25 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
>>> ehlo rhu.barb
??? 250-
<<< 250-myhost.test.ex Hello rhu.barb [ip4.ip4.ip4.ip4]
-??? 250-
+??? 250-SIZE
<<< 250-SIZE 52428800
-??? 250-
+??? 250-8BITMIME
<<< 250-8BITMIME
-??? 250-
+??? 250-PIPELINING
<<< 250-PIPELINING
-??? 250-
+??? 250-STARTTLS
<<< 250-STARTTLS
-??? 250
+??? 250 HELP
<<< 250 HELP
>>> starttls
-??? 220
+??? 220 TLS go ahead
<<< 220 TLS go ahead
Attempting to start TLS
A TLS fatal alert has been received.
Failed to start TLS
+>>> nop
+???*
+Expected EOF read
End of script
Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
Certificate file = TESTSUITE/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.pem
