DMARC: expand main-config options. Bug 3102

[exim.git] / test / scripts / 2000-GnuTLS / 2029

diff --git a/test/scripts/2000-GnuTLS/2029 b/test/scripts/2000-GnuTLS/2029
index e371e68d7e07d019fa32e83ac0161f909d85af2d..19ab6318371066afb68467d7f60dd7ec3b8d2356 100644 (file)
--- a/test/scripts/2000-GnuTLS/2029
+++ b/test/scripts/2000-GnuTLS/2029
@@ -13,36 +13,13 @@ ehlo abcd
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-

-??? 250
-starttls
-??? 220
-mail from:<userx@test.ex>
-??? 250
-rcpt to:<userx@test.ex>
-??? 250
-data
-??? 354
-This is a test message.
-.
-+++ 1
-****
-sleep 1
-killdaemon
-#
-# Also check for next input sent too soon
-#
-exim -DSERVER=server -bd -oX PORT_D
-****
-client-gnutls 127.0.0.1 PORT_D
-??? 220
-ehlo abcd
-??? 250-
-??? 250-

 ??? 250-
 ??? 250-
 ??? 250
 starttls
 ??? 220
 ??? 250-
 ??? 250-
 ??? 250
 starttls
 ??? 220

+helo test
+??? 250

 mail from:<userx@test.ex>
 ??? 250
 rcpt to:<userx@test.ex>
 mail from:<userx@test.ex>
 ??? 250
 rcpt to:<userx@test.ex>


@@ -50,7 +27,7 @@ rcpt to:<userx@test.ex>
 data
 ??? 354
 This is a test message.
 data
 ??? 354
 This is a test message.

-.\r\nrset
+.

 +++ 1
 ****
 sleep 1
 +++ 1
 ****
 sleep 1