Testsuite: output changes resulting

[users/jgh/exim.git] / test / scripts / 4200-International / 4201

diff --git a/test/scripts/4200-International/4201 b/test/scripts/4200-International/4201
index 17b97c7e6cd9f3ef91f32674c28bfc31da0269e2..5a591fdea15c5138959c7ffbf3090d44fb8f0b2d 100644 (file)
--- a/test/scripts/4200-International/4201
+++ b/test/scripts/4200-International/4201
@@ -1,5 +1,5 @@
-# Internationalised mail: smtp
-# Exim test configuration 4200
+# Internationalised mail: smtp input and forwarding
+# Exim test configuration 4201

 #
 exim -DSERVER=server -bd -oX PORT_D
 ****
 #
 exim -DSERVER=server -bd -oX PORT_D
 ****


@@ -31,7 +31,7 @@ QUIT
 ****
 #
 #
 ****
 #
 #

-# utf-8 from, Basic smtp input, no delivery
+# utf-8 from, Basic smtp input, no delivery.  Two messages in a connection.

 client 127.0.0.1 PORT_D
 ??? 220
 EHLO client
 client 127.0.0.1 PORT_D
 ??? 220
 EHLO client


@@ -49,6 +49,17 @@ DATA
 ??? 354
 Subject: test
 
 ??? 354
 Subject: test
 

+body
+.
+??? 250
+MAIL FROM: <ليهمابتكلموشعربي؟@czech.Pročprostěnemluvíčesky.com> SMTPUTF8
+??? 250
+RCPT TO: <usery@test.ex>
+??? 250
+DATA
+??? 354
+Subject: test
+

 body
 .
 ??? 250
 body
 .
 ??? 250


@@ -70,29 +81,28 @@ body
 QUIT
 ****
 #
 QUIT
 ****
 #

-#
-#

 killdaemon
 killdaemon

-exim -DSERVER=server -DOPTION="" -bd -oX PORT_D
+exim -DSERVER=server -DNOTDAEMON -qqff

 ****
 #
 ****
 #

-# forwarding fails when target does not support SMTPUTF8
-exim -bs -odi
-EHLO client.ffail
-MAIL FROM: <यहलोगहिन्दीक्योंनहींबोलसकतेहैं@japanese.なぜみんな日本語を話してくれないのか.com> SMTPUTF8
-RCPT TO: <userz@test.ex>
-DATA
-Subject: test
-
-body
-.
+#
+# Attempt to use when not advertised
+exim -DSERVER=server -DOPTION=: -bd -oX PORT_D
+****
+client 127.0.0.1 PORT_D
+??? 220
+EHLO client
+??? 250-
+??? 250-SIZE
+??? 250-8BITMIME
+??? 250-PIPELINING
+??? 250 HELP
+MAIL FROM: <someone@some.domain> SMTPUTF8
+??? 501

 QUIT
 QUIT

+??? 221

 ****
 ****

+killdaemon

 #
 #
 #
 #

-#
-killdaemon
-exim -DSERVER=server -qq
-****

 no_msglog_check
 no_msglog_check

-