X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/9671784a54a6729881f7716a0b963a0422e8b3dd..HEAD:/test/scripts/4200-International/4201?ds=sidebyside

diff --git a/test/scripts/4200-International/4201 b/test/scripts/4200-International/4201
index d2fb96cdf..27a977552 100644
--- 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
 ****
@@ -11,6 +11,7 @@ client 127.0.0.1 PORT_D
 EHLO client
 ??? 250-
 ??? 250-SIZE
+??? 250-LIMITS
 ??? 250-8BITMIME
 ??? 250-PIPELINING
 ??? 250-SMTPUTF8
@@ -31,12 +32,13 @@ 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
 ??? 250-
 ??? 250-SIZE
+??? 250-LIMITS
 ??? 250-8BITMIME
 ??? 250-PIPELINING
 ??? 250-SMTPUTF8
@@ -49,6 +51,17 @@ DATA
 ??? 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
@@ -70,33 +83,29 @@ body
 QUIT
 ****
 #
-#
-#
 killdaemon
-sleep 1
-exim -DSERVER=server -qqff
+exim -DSERVER=server -DNOTDAEMON -qqff
 ****
 #
 #
-exim -DSERVER=server -DOPTION="" -bd -oX PORT_D
+# Attempt to use when not advertised
+exim -DSERVER=server -DOPTION=: -bd -oX PORT_D
 ****
-#
-# forwarding fails when target does not support SMTPUTF8
-exim -bs -odi
-EHLO client.ffail
-MAIL FROM: <यहलोगहिन्दीक्योंनहींबोलसकतेहैं@japanese.なぜみんな日本語を話してくれないのか.local> SMTPUTF8
-RCPT TO: <userz@test.ex>
-DATA
-Subject: test
-
-body
-.
+client 127.0.0.1 PORT_D
+??? 220
+EHLO client
+??? 250-
+??? 250-SIZE
+??? 250-LIMITS
+??? 250-8BITMIME
+??? 250-PIPELINING
+??? 250 HELP
+MAIL FROM: <someone@some.domain> SMTPUTF8
+??? 501
 QUIT
+??? 221
 ****
-#
-#
-#
 killdaemon
 #
-exim -qfl
-****
+#
+no_msglog_check