git://git.exim.org
/
exim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4969297
)
Testsuite: synch log output
author
Jeremy Harris
<jgh146exb@wizmail.org>
Sat, 20 Jul 2019 14:25:23 +0000
(15:25 +0100)
committer
Jeremy Harris
<jgh146exb@wizmail.org>
Sat, 20 Jul 2019 15:13:55 +0000
(16:13 +0100)
test/confs/0460
patch
|
blob
|
history
test/log/0460
patch
|
blob
|
history
test/log/2002
patch
|
blob
|
history
test/scripts/0000-Basic/0460
patch
|
blob
|
history
test/scripts/2000-GnuTLS/2002
patch
|
blob
|
history
test/stdout/2002
patch
|
blob
|
history
diff --git
a/test/confs/0460
b/test/confs/0460
index 52628ab25aa7f36af93e1e13e68c19ec7eaff9ac..6c6ec7477c2f99c45b6a636a1fccfda71ea1196c 100644
(file)
--- a/
test/confs/0460
+++ b/
test/confs/0460
@@
-8,6
+8,8
@@
primary_hostname = myhost.test.ex
# ----- Main settings -----
qualify_domain = test.ex
# ----- Main settings -----
qualify_domain = test.ex
+queue_only
+queue_run_in_order
acl_smtp_rcpt = accept
acl_smtp_rcpt = accept
diff --git
a/test/log/0460
b/test/log/0460
index 146072ffeccffb01b115889337cdd0a141e910cb..06a6ffafa1a61229280fba25aba3e12d5026e14f 100644
(file)
--- 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@test.ex> 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@test.ex> 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@test.ex H=(rhu.barb) [127.0.0.1] P=esmtp S=sss
1999-03-02 09:44:33 10HmaY-0005vi-00 <= userx@test.ex H=(rhu.barb) [127.0.0.1] P=esmtp S=sss
******** 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@test.ex H=(rhu.barb) [127.0.0.1] P=esmtp S=sss
1999-03-02 09:44:33 10HmaY-0005vi-00 <= userx@test.ex H=(rhu.barb) [127.0.0.1] P=esmtp S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 => userx <userx@test.ex> 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@test.ex> 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 9343c37cd5a126ae5d86c2eac45f50100c83bee4..825c0dfd0c59ddd397d6a048c4d55977cf1bc68f 100644
(file)
--- 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"@test.ex 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 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"@test.ex 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
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@test.ex 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 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@test.ex 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 beb4e00db9c53523f531ab5a3b0018d8912359ed..953641b1066a8bfd4b7fc402d8ad7bf852b62f3e 100644
(file)
--- a/
test/scripts/0000-Basic/0460
+++ b/
test/scripts/0000-Basic/0460
@@
-43,6
+43,6
@@
QUIT
??? 221
****
killdaemon
??? 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 1cfc293d5840e8fb535c815bbe778123d4022a3d..c96ffa1b98a1625af583a867d1457cb2d48f87e9 100644
(file)
--- a/
test/scripts/2000-GnuTLS/2002
+++ b/
test/scripts/2000-GnuTLS/2002
@@
-59,19
+59,29
@@
This is a test encrypted message.
quit
??? 221
****
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-
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
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
# 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
??? 221
****
killdaemon
+sleep 1
+# clear out the queue
exim -qf
****
exim -qf
****
+sleep 1
+#
+# STARTTLS used when not advertised
exim -bh 10.0.0.1
starttls
quit
exim -bh 10.0.0.1
starttls
quit
diff --git
a/test/stdout/2002
b/test/stdout/2002
index 7462793a3bb7dcea2df51c026fd1b1f60574c919..276c903e6ace01e4154678b103eb19736397cb82 100644
(file)
--- 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]
>>> ehlo rhu.barb
??? 250-
<<< 250-myhost.test.ex Hello rhu.barb [ip4.ip4.ip4.ip4]
-??? 250-
+??? 250-
SIZE
<<< 250-SIZE 52428800
<<< 250-SIZE 52428800
-??? 250-
+??? 250-
8BITMIME
<<< 250-8BITMIME
<<< 250-8BITMIME
-??? 250-
+??? 250-
PIPELINING
<<< 250-PIPELINING
<<< 250-PIPELINING
-??? 250-
+??? 250-
STARTTLS
<<< 250-STARTTLS
<<< 250-STARTTLS
-??? 250
+??? 250
HELP
<<< 250 HELP
>>> starttls
<<< 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
<<< 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
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