From 8990f2d1d6f3293ffb74b79a3c09f5b684823567 Mon Sep 17 00:00:00 2001 From: Leander Beernaert Date: Fri, 2 Dec 2022 14:56:29 +0100 Subject: [PATCH] Other: Ensure expunge feature test pushes to error stack --- tests/features/imap/message/delete.feature | 14 ++++++++------ tests/features/imap/message/drafts.feature | 1 + tests/imap_test.go | 4 +++- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/tests/features/imap/message/delete.feature b/tests/features/imap/message/delete.feature index 2e10764c..11df8b0d 100644 --- a/tests/features/imap/message/delete.feature +++ b/tests/features/imap/message/delete.feature @@ -16,12 +16,14 @@ Feature: IMAP remove messages from mailbox And IMAP client "1" marks message 2 as deleted Then IMAP client "1" sees that message 2 has the flag "\Deleted" When IMAP client "1" expunges + And it succeeds Then IMAP client "1" sees 9 messages in "Folders/mbox" Scenario: Mark all messages as deleted and EXPUNGE When IMAP client "1" selects "Folders/mbox" And IMAP client "1" marks all messages as deleted And IMAP client "1" expunges + And it succeeds Then IMAP client "1" sees 0 messages in "Folders/mbox" Scenario: Mark messages as undeleted and EXPUNGE @@ -30,11 +32,11 @@ Feature: IMAP remove messages from mailbox But IMAP client "1" marks message 2 as not deleted And IMAP client "1" marks message 3 as not deleted When IMAP client "1" expunges + And it succeeds Then IMAP client "1" sees 2 messages in "Folders/mbox" -# TODO(GODT-1989): Re-enable! -# Scenario: Not possible to delete from All Mail and expunge does nothing -# When IMAP client "1" selects "All Mail" -# And IMAP client "1" marks message 2 as deleted -# And IMAP client "1" expunges -# Then IMAP client "1" eventually sees 10 messages in "All Mail" \ No newline at end of file + Scenario: Not possible to delete from All Mail and expunge does nothing + When IMAP client "1" selects "All Mail" + And IMAP client "1" marks message 2 as deleted + And IMAP client "1" expunges + Then it fails \ No newline at end of file diff --git a/tests/features/imap/message/drafts.feature b/tests/features/imap/message/drafts.feature index bdcfb46b..721d84d8 100644 --- a/tests/features/imap/message/drafts.feature +++ b/tests/features/imap/message/drafts.feature @@ -19,6 +19,7 @@ Feature: IMAP Draft messages Scenario: Draft edited locally When IMAP client "1" marks message 1 as deleted And IMAP client "1" expunges + And it succeeds And IMAP client "1" appends the following message to "Drafts": """ Subject: Basic Draft diff --git a/tests/imap_test.go b/tests/imap_test.go index efeaf1bd..f7707d1c 100644 --- a/tests/imap_test.go +++ b/tests/imap_test.go @@ -377,7 +377,9 @@ func (s *scenario) imapClientSeesThatMessageHasTheFlag(clientID string, seq int, func (s *scenario) imapClientExpunges(clientID string) error { _, client := s.t.getIMAPClient(clientID) - return client.Expunge(nil) + s.t.pushError(client.Expunge(nil)) + + return nil } func (s *scenario) imapClientAppendsTheFollowingMessageToMailbox(clientID string, mailbox string, docString *godog.DocString) error {