Other: Ensure expunge feature test pushes to error stack

This commit is contained in:
Leander Beernaert
2022-12-02 14:56:29 +01:00
parent 7bc608ce6c
commit 8990f2d1d6
3 changed files with 12 additions and 7 deletions

View File

@ -16,12 +16,14 @@ Feature: IMAP remove messages from mailbox
And IMAP client "1" marks message 2 as deleted And IMAP client "1" marks message 2 as deleted
Then IMAP client "1" sees that message 2 has the flag "\Deleted" Then IMAP client "1" sees that message 2 has the flag "\Deleted"
When IMAP client "1" expunges When IMAP client "1" expunges
And it succeeds
Then IMAP client "1" sees 9 messages in "Folders/mbox" Then IMAP client "1" sees 9 messages in "Folders/mbox"
Scenario: Mark all messages as deleted and EXPUNGE Scenario: Mark all messages as deleted and EXPUNGE
When IMAP client "1" selects "Folders/mbox" When IMAP client "1" selects "Folders/mbox"
And IMAP client "1" marks all messages as deleted And IMAP client "1" marks all messages as deleted
And IMAP client "1" expunges And IMAP client "1" expunges
And it succeeds
Then IMAP client "1" sees 0 messages in "Folders/mbox" Then IMAP client "1" sees 0 messages in "Folders/mbox"
Scenario: Mark messages as undeleted and EXPUNGE 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 But IMAP client "1" marks message 2 as not deleted
And IMAP client "1" marks message 3 as not deleted And IMAP client "1" marks message 3 as not deleted
When IMAP client "1" expunges When IMAP client "1" expunges
And it succeeds
Then IMAP client "1" sees 2 messages in "Folders/mbox" 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
# Scenario: Not possible to delete from All Mail and expunge does nothing When IMAP client "1" selects "All Mail"
# When IMAP client "1" selects "All Mail" And IMAP client "1" marks message 2 as deleted
# And IMAP client "1" marks message 2 as deleted And IMAP client "1" expunges
# And IMAP client "1" expunges Then it fails
# Then IMAP client "1" eventually sees 10 messages in "All Mail"

View File

@ -19,6 +19,7 @@ Feature: IMAP Draft messages
Scenario: Draft edited locally Scenario: Draft edited locally
When IMAP client "1" marks message 1 as deleted When IMAP client "1" marks message 1 as deleted
And IMAP client "1" expunges And IMAP client "1" expunges
And it succeeds
And IMAP client "1" appends the following message to "Drafts": And IMAP client "1" appends the following message to "Drafts":
""" """
Subject: Basic Draft Subject: Basic Draft

View File

@ -377,7 +377,9 @@ func (s *scenario) imapClientSeesThatMessageHasTheFlag(clientID string, seq int,
func (s *scenario) imapClientExpunges(clientID string) error { func (s *scenario) imapClientExpunges(clientID string) error {
_, client := s.t.getIMAPClient(clientID) _, 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 { func (s *scenario) imapClientAppendsTheFollowingMessageToMailbox(clientID string, mailbox string, docString *godog.DocString) error {