diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2018-10-20 20:07:21 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2018-10-21 14:55:24 +0100 |
| commit | 099afc4f7362d39816cb3555127214548dd9cb35 (patch) | |
| tree | 273898f153f8c8dedfdc0d9178bf2804022e78aa /test/stdout | |
| parent | 3b7ac02caeb878252361e602dc46e96104f773a9 (diff) | |
Ensure unique message-id even for rejected messages
Diffstat (limited to 'test/stdout')
| -rw-r--r-- | test/stdout/2014 | 8 | ||||
| -rw-r--r-- | test/stdout/2015 | 8 | ||||
| -rw-r--r-- | test/stdout/2024 | 10 | ||||
| -rw-r--r-- | test/stdout/2034 | 8 |
4 files changed, 20 insertions, 14 deletions
diff --git a/test/stdout/2014 b/test/stdout/2014 index cb24d0561..d29a3bd86 100644 --- a/test/stdout/2014 +++ b/test/stdout/2014 @@ -21,6 +21,8 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected Attempting to start TLS A TLS fatal alert has been received. Failed to start TLS +>>> nop +????554 End of script ### No certificate, certificate optional at TLS time, required by ACL Connecting to 127.0.0.1 port 1225 ... connected @@ -150,6 +152,8 @@ Key file = aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net Attempting to start TLS A TLS fatal alert has been received. Failed to start TLS +>>> nop +????554 End of script ### Bad certificate, certificate optional at TLS time, reject at ACL time Connecting to 127.0.0.1 port 1225 ... connected @@ -250,9 +254,9 @@ Certificate file = aux-fixed/exim-ca/example.com/server1.example.com/server1.exa Key file = aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.unlocked.key ??? 220 <<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 ->>> ehlo rhu.barb +>>> ehlo rhu9.barb ??? 250- -<<< 250-myhost.test.ex Hello rhu.barb [ip4.ip4.ip4.ip4] +<<< 250-myhost.test.ex Hello rhu9.barb [ip4.ip4.ip4.ip4] ??? 250- <<< 250-SIZE 52428800 ??? 250- diff --git a/test/stdout/2015 b/test/stdout/2015 index 42fe5c0fd..bfef01151 100644 --- a/test/stdout/2015 +++ b/test/stdout/2015 @@ -1,9 +1,9 @@ Connecting to 127.0.0.1 port 1225 ... connected ??? 220 <<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 ->>> ehlo rhu.barb +>>> ehlo timeout.rhu.barb ??? 250- -<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1] +<<< 250-myhost.test.ex Hello timeout.rhu.barb [127.0.0.1] ??? 250- <<< 250-SIZE 52428800 ??? 250- @@ -24,9 +24,9 @@ End of script Connecting to 127.0.0.1 port 1225 ... connected ??? 220 <<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 ->>> ehlo rhu.barb +>>> ehlo close.rhu.barb ??? 250- -<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1] +<<< 250-myhost.test.ex Hello close.rhu.barb [127.0.0.1] ??? 250- <<< 250-SIZE 52428800 ??? 250- diff --git a/test/stdout/2024 b/test/stdout/2024 index b25f1c8f4..f2f660e59 100644 --- a/test/stdout/2024 +++ b/test/stdout/2024 @@ -3,9 +3,9 @@ Certificate file = aux-fixed/cert2 Key file = aux-fixed/cert2 ??? 220 <<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 ->>> ehlo rhu.barb +>>> ehlo rhu1.barb ??? 250- -<<< 250-myhost.test.ex Hello rhu.barb [ip4.ip4.ip4.ip4] +<<< 250-myhost.test.ex Hello rhu1.barb [ip4.ip4.ip4.ip4] ??? 250- <<< 250-SIZE 52428800 ??? 250- @@ -22,15 +22,17 @@ Key file = aux-fixed/cert2 Attempting to start TLS A TLS fatal alert has been received. Failed to start TLS +>>> nop +????554 End of script Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected Certificate file = aux-fixed/cert2 Key file = aux-fixed/cert2 ??? 220 <<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 ->>> ehlo rhu.barb +>>> ehlo rhu2.barb ??? 250- -<<< 250-myhost.test.ex Hello rhu.barb [ip4.ip4.ip4.ip4] +<<< 250-myhost.test.ex Hello rhu2.barb [ip4.ip4.ip4.ip4] ??? 250- <<< 250-SIZE 52428800 ??? 250- diff --git a/test/stdout/2034 b/test/stdout/2034 index 94531616d..19e959b8b 100644 --- a/test/stdout/2034 +++ b/test/stdout/2034 @@ -1,9 +1,9 @@ Connecting to 127.0.0.1 port 1225 ... connected ??? 220 <<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 ->>> ehlo rhu.barb +>>> ehlo rhu1.barb ??? 250- -<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1] +<<< 250-myhost.test.ex Hello rhu1.barb [127.0.0.1] ??? 250- <<< 250-SIZE 52428800 ??? 250- @@ -22,9 +22,9 @@ End of script Connecting to 127.0.0.1 port 1225 ... connected ??? 220 <<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 ->>> ehlo rhu.barb +>>> ehlo rhu2.barb ??? 250- -<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1] +<<< 250-myhost.test.ex Hello rhu2.barb [127.0.0.1] ??? 250- <<< 250-SIZE 52428800 ??? 250- |