From 7ac1e222090ecfaa27ea8de2950e8c98a5033137 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Thu, 7 Jul 2016 11:57:43 +0200 Subject: Fix imap tests after trash addition --- examples/imapresource/tests/resetmailbox.sh | 1 + tests/mailsynctest.cpp | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/examples/imapresource/tests/resetmailbox.sh b/examples/imapresource/tests/resetmailbox.sh index 8834b51..6ed198e 100644 --- a/examples/imapresource/tests/resetmailbox.sh +++ b/examples/imapresource/tests/resetmailbox.sh @@ -4,6 +4,7 @@ sudo echo "sam user.doe.* cyrus c" | cyradm --auth PLAIN -u cyrus -w admin local sudo echo "dm user.doe.*" | cyradm --auth PLAIN -u cyrus -w admin localhost sudo echo "cm user.doe.test" | cyradm --auth PLAIN -u cyrus -w admin localhost sudo echo "cm user.doe.Drafts" | cyradm --auth PLAIN -u cyrus -w admin localhost +sudo echo "cm user.doe.Trash" | cyradm --auth PLAIN -u cyrus -w admin localhost sudo echo "sam user.doe cyrus c" | cyradm --auth PLAIN -u cyrus -w admin localhost sudo cp /work/source/Sink/examples/imapresource/tests/data/1365777830.R28.localhost.localdomain\:2\,S /var/spool/imap/d/user/doe/test/1. sudo chown cyrus:mail /var/spool/imap/d/user/doe/test/1. diff --git a/tests/mailsynctest.cpp b/tests/mailsynctest.cpp index faaf003..953adbf 100644 --- a/tests/mailsynctest.cpp +++ b/tests/mailsynctest.cpp @@ -197,6 +197,10 @@ void MailSyncTest::testListFolderHierarchy() QVERIFY(names.contains("Drafts")); names.removeAll("Drafts"); } + if (mCapabilities.contains(ResourceCapabilities::Mail::trash)) { + QVERIFY(names.contains("Trash")); + names.removeAll("Trash"); + } QCOMPARE(names.size(), 3); QCOMPARE(map.value("sub")->getParent(), map.value("test")->identifier()); }); -- cgit v1.2.3