From 964551ca40d4f7355bde171e801249405e6c580e Mon Sep 17 00:00:00 2001
From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Thu, 10 May 2012 23:38:57 +0100
Subject: [PATCH] Testsuite: updates for 8bitmime-as-default (Dovecot;
 untested).

---
 test/scripts/3650-Dovecot/3650     | 18 ------------------
 test/scripts/3650-Dovecot/REQUIRES |  2 --
 test/scripts/9350-Dovecot/9350     | 19 ++++++++++++-------
 3 files changed, 12 insertions(+), 27 deletions(-)
 delete mode 100644 test/scripts/3650-Dovecot/3650
 delete mode 100644 test/scripts/3650-Dovecot/REQUIRES

diff --git a/test/scripts/3650-Dovecot/3650 b/test/scripts/3650-Dovecot/3650
deleted file mode 100644
index 55b6c1e42..000000000
--- a/test/scripts/3650-Dovecot/3650
+++ /dev/null
@@ -1,18 +0,0 @@
-# Dovecot authentication (server only)
-exim -DSERVER=server -bd -oX PORT_D
-****
-client -t3 127.0.0.1 PORT_D
-??? 220
-EHLO xxxx
-??? 250-
-??? 250-
-??? 250-
-??? 250-
-??? 250
-AUTH PLAIN AHVzZXJ4AHNlY3JldA==
-??? 535
-quit
-??? 221
-****
-killdaemon
-no_msglog_check
diff --git a/test/scripts/3650-Dovecot/REQUIRES b/test/scripts/3650-Dovecot/REQUIRES
deleted file mode 100644
index 76218eb92..000000000
--- a/test/scripts/3650-Dovecot/REQUIRES
+++ /dev/null
@@ -1,2 +0,0 @@
-authenticator dovecot
-running IPv4
diff --git a/test/scripts/9350-Dovecot/9350 b/test/scripts/9350-Dovecot/9350
index 3325f246c..ccfaf32b6 100644
--- a/test/scripts/9350-Dovecot/9350
+++ b/test/scripts/9350-Dovecot/9350
@@ -3,14 +3,15 @@ exim -DSERVER=server -bd -oX PORT_D
 ****
 # Try without TLS
 client -t3 127.0.0.1 PORT_D
-??? 220
+??? 220 myhost
 EHLO xxxx
-??? 250-
-??? 250-
-??? 250-
-??? 250-
-??? 250-
-??? 250
+??? 250-myhost
+??? 250-SIZE
+??? 250-8BITMIME
+??? 250-PIPELINING
+??? 250-AUTH
+??? 250-STARTTLS
+??? 250 HELP
 AUTH PLAIN AHVzZXJ4AHNlY3JldA==
 ??? 535
 quit
@@ -25,6 +26,7 @@ EHLO xxxx
 ??? 250-
 ??? 250-
 ??? 250-
+??? 250-
 ??? 250
 STARTTLS
 ??? 220
@@ -33,6 +35,7 @@ EHLO xxxx
 ??? 250-
 ??? 250-
 ??? 250-
+??? 250-
 ??? 250
 AUTH PLAIN AHVzZXJ4AHNlY3JldA==
 ??? 535
@@ -48,6 +51,7 @@ EHLO xxxx
 ??? 250-
 ??? 250-
 ??? 250-
+??? 250-
 ??? 250
 STARTTLS
 ??? 220
@@ -56,6 +60,7 @@ EHLO xxxx
 ??? 250-
 ??? 250-
 ??? 250-
+??? 250-
 ??? 250
 AUTH PLAIN AHVzZXJ4AHNlY3JldA==
 ??? 535
-- 
2.30.2