courier-imap: update testsuite.

3 files changed, 8 insertions, 3 deletions

diff --git a/imap/testsuite b/imap/testsuite
index 53671c0..1283f28 100755
--- a/imap/testsuite
+++ b/imap/testsuite
@@ -12,7 +12,7 @@ echo '* Sanity check in progress *' >&2
 echo '****************************' >&2
 #test ! -d confmdtest || find confmdtest -exec chmod u+rwx {} \;
 #test ! -d confmdtest2 || find confmdtest2 -exec chmod u+rwx {} \;
-test ! -d confmdtest || chmod -R u+rwx confmdtest 
+test ! -d confmdtest || chmod -R u+rwx confmdtest
 test ! -d confmdtest2 || chmod -R u+rwx confmdtest2
 rm -rf confmdtest
 ../maildir/maildirmake confmdtest || exit 1
@@ -1033,6 +1033,7 @@ usér/3	1	1	`pwd`	confmdtest3
 EOF
 
 env AUTHENTICATED=user1 IMAP_KEYWORDS=1 IMAP_MOVE_EXPUNGE_TO_TRASH=1 IMAP_BROKENUIDV=1 MAILDIR=confmdtest2 ./imapd <<EOF | sed 's/UIDVALIDITY [0-9]*/UIDVALIDITY/;s/INTERNALDATE "[^"]*"/INTERNALDATE -DATE-/g'
+a ENABLE UTF8=ACCEPT
 T055 LIST "" "#shared.b.*"
 T056 LIST "" "#shared.b.%"
 T057 LIST "" "#shared.b.user 2.*"
@@ -1041,6 +1042,7 @@ TDONE LOGOUT
 EOF
 
 env IMAP_SHAREDMUNGENAMES=1 AUTHENTICATED=user1 IMAP_KEYWORDS=1 IMAP_MOVE_EXPUNGE_TO_TRASH=1 IMAP_BROKENUIDV=1 MAILDIR=confmdtest2 ./imapd <<EOF | sed 's/UIDVALIDITY [0-9]*/UIDVALIDITY/;s/INTERNALDATE "[^"]*"/INTERNALDATE -DATE-/g'
+a ENABLE UTF8=ACCEPT
 T055 LIST "" "#shared.b.*"
 T056 LIST "" "#shared.b.%"
 T057 LIST "" "#shared.b.user\\\\:2.*"
@@ -1081,4 +1083,3 @@ T085 GETACL INBOX
 T086 LIST(ACL) "" INBOX
 TDONE LOGOUT
 EOF
-
diff --git a/imap/testsuite.txt b/imap/testsuite.txt
index 5a341cd..e5a2888 100644
--- a/imap/testsuite.txt
+++ b/imap/testsuite.txt
@@ -1586,6 +1586,7 @@
 001360 * BYE Courier-IMAP server shutting down

 001361 TDONE OK LOGOUT completed

 001362 * PREAUTH Ready.

+001363 * ENABLED UTF8=ACCEPT

 001363 * LIST (\HasChildren) "." "#shared.b.us&AOk-r 3"

 001363 * LIST (\HasChildren) "." "#shared.b.use&-2"

 001363 * LIST (\HasChildren) "." "#shared.b.user 2"

@@ -1593,6 +1594,7 @@
 001363 * LIST (\HasNoChildren) "." "#shared.b.use&-2.a"

 001363 * LIST (\HasNoChildren) "." "#shared.b.user 2.a"

 001363 T055 OK LIST completed

+001363 a OK Options enabled

 001364 * LIST (\HasChildren) "." "#shared.b.us&AOk-r 3"

 001364 * LIST (\HasChildren) "." "#shared.b.use&-2"

 001364 * LIST (\HasChildren) "." "#shared.b.user 2"

@@ -1604,6 +1606,7 @@
 001367 * BYE Courier-IMAP server shutting down

 001368 TDONE OK LOGOUT completed

 001369 * PREAUTH Ready.

+001370 * ENABLED UTF8=ACCEPT

 001370 * LIST (\HasChildren) "." "#shared.b.us&AOk-r\\;3"

 001370 * LIST (\HasChildren) "." "#shared.b.use&-2"

 001370 * LIST (\HasChildren) "." "#shared.b.user\\:2"

@@ -1611,6 +1614,7 @@
 001370 * LIST (\HasNoChildren) "." "#shared.b.use&-2.a"

 001370 * LIST (\HasNoChildren) "." "#shared.b.user\\:2.a"

 001370 T055 OK LIST completed

+001370 a OK Options enabled

 001371 * LIST (\HasChildren) "." "#shared.b.us&AOk-r\\;3"

 001371 * LIST (\HasChildren) "." "#shared.b.use&-2"

 001371 * LIST (\HasChildren) "." "#shared.b.user\\:2"

diff --git a/imap/testsuitefix.pl.in b/imap/testsuitefix.pl.in
index ee22d8c..abe0e6f 100644
--- a/imap/testsuitefix.pl.in
+++ b/imap/testsuitefix.pl.in
@@ -17,5 +17,5 @@ while (<>)
     s/^\* ADD \"UID=.*/* ADD UID/;
     s/^\* COPY \d+ \"NEWUID=.*/* COPY NEWUID/;
     printf("%06d %s", $n, $_);
-    ++$n unless $_ =~ /^\* (LIST|LSUB)/;
+    ++$n unless $_ =~ /^\* (LIST|LSUB|ENABLED)/ || $_ =~ /Options enabled/;
 }