2 files changed, 39 insertions, 2 deletions
diff --git a/imap/testsuite b/imap/testsuite
index 268d370..99a14a1 100755
--- a/imap/testsuite
+++ b/imap/testsuite
@@ -1092,11 +1092,21 @@ EOF
 
 rm -rf confmdtest confmdtest2
 ../maildir/maildirmake confmdtest
+../maildir/maildirmake -f Trash confmdtest
 ../maildir/maildirmake -S confmdtest2
 ../maildir/maildirmake -s write -f writable confmdtest2
 ../maildir/maildirmake --add another=`pwd`/confmdtest2 confmdtest
 
-env IMAP_BROKENUIDV=1 MAILDIR=confmdtest AUTHENTICATED=user1 $IMAPINVOKE <<EOF
+echo '#! /bin/sh' >confsendmail
+echo "cat >`pwd`/confsendmail.out" >>confsendmail
+chmod +x confsendmail
+
+echo >confmdtest/.Trash/cur/msg:2
+touch -t 202001011200 confmdtest/.Trash/cur/msg:2
+
+env IMAP_BROKENUIDV=1 IMAP_TRASHFOLDERNAME=Trash IMAP_EMPTYTRASH=Trash:7 \
+    MAILDIR=confmdtest AUTHENTICATED=user1 OUTBOX=.Outbox \
+    SENDMAIL=`pwd`/confsendmail $IMAPINVOKE <<EOF
 U001 APPEND INBOX \Seen {5}
 test
 
@@ -1108,4 +1118,17 @@ U006 DELETE INBOX
 U007 LISTRIGHTS INBOX user=user1
 U008 LISTRIGHTS shared.another.writable user=user1
 U009 MYRIGHTS INBOX
+U010 COPY 1 public.nonexistent
+U011 COPY 1 INBOX.nonexistent
+U012 CREATE INBOX.Outbox
+U013 APPEND INBOX \Seen {5}
+test
+
+U014 NOOP
+U015 COPY 1,2 INBOX.Outbox
+U016 COPY 1 INBOX.Outbox
 EOF
+echo "===Sent=="
+cat confsendmail.out
+echo "==="
+rm -f confsendmail confsendmail.out
diff --git a/imap/testsuite.txt b/imap/testsuite.txt
index 834d6de..1f541c9 100644
--- a/imap/testsuite.txt
+++ b/imap/testsuite.txt
@@ -1702,10 +1702,11 @@
 001416 * PREAUTH Ready.
 001417 + OK
 001418 U001 OK APPEND Ok.
+001419 * LIST (\HasNoChildren) "." "INBOX.Trash"
 001419 * LIST (\HasNoChildren) "." "shared.another.writable"
 001419 * LIST (\Noselect \HasChildren) "." "shared"
 001419 * LIST (\Noselect \HasChildren) "." "shared.another"
-001419 * LIST (\Unmarked \HasNoChildren) "." "INBOX"
+001419 * LIST (\Unmarked \HasChildren) "." "INBOX"
 001419 U002 OK LIST completed
 001420 * FLAGS (\Draft \Answered \Flagged \Deleted \Seen \Recent)
 001421 * OK [PERMANENTFLAGS (\Draft \Answered \Flagged \Deleted \Seen)] Limited
@@ -1723,3 +1724,16 @@
 001431 U008 OK LISTRIGHTS completed.
 001432 * MYRIGHTS "INBOX" "acdilrsw"
 001433 U009 OK MYRIGHTS completed.
+001434 U010 NO Error in IMAP command received by server.
+001435 U011 NO [TRYCREATE] Mailbox does not exist.
+001436 U012 OK "INBOX.Outbox" created.
+001437 + OK
+001438 U013 OK APPEND Ok.
+001439 * 2 EXISTS
+001440 * 0 RECENT
+001441 U014 OK NOOP completed
+001442 U015 NO [ALERT] Only one message may be sent at a time.
+001443 U016 OK COPY completed.
+001444 ===Sent==
+001445 test
+001446 ===