diff options
| -rw-r--r-- | src/mailman/runners/digest.py | 4 | ||||
| -rw-r--r-- | src/mailman/runners/tests/test_digest.py | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/mailman/runners/digest.py b/src/mailman/runners/digest.py index 4173d9673..9b8335024 100644 --- a/src/mailman/runners/digest.py +++ b/src/mailman/runners/digest.py @@ -323,8 +323,6 @@ class DigestRunner(Runner): # Finish up the digests. mime = mime_digest.finish() rfc1153 = rfc1153_digest.finish() - # Remove the digest mbox (GL#259) - os.remove(msgdata['digest_path']) # Calculate the recipients lists mime_recipients = set() rfc1153_recipients = set() @@ -372,3 +370,5 @@ class DigestRunner(Runner): recipients=rfc1153_recipients, listid=mlist.list_id, isdigest=True) + # Remove the digest mbox (GL#259) + os.remove(msgdata['digest_path']) diff --git a/src/mailman/runners/tests/test_digest.py b/src/mailman/runners/tests/test_digest.py index f0993cff3..1565af262 100644 --- a/src/mailman/runners/tests/test_digest.py +++ b/src/mailman/runners/tests/test_digest.py @@ -75,9 +75,9 @@ class TestDigest(unittest.TestCase): bart.preferences.delivery_mode = DeliveryMode.plaintext_digests make_digest_messages(self._mlist) self._check_virgin_queue() - # The digest mbox must have been removed (GL#259) - self.assertFalse(os.path.exists( - os.path.join(self._mlist.data_path, 'digest.mmdf'))) + # The digest mbox and all intermediary mboxes must have been removed + # (GL#259). + self.assertEqual(os.listdir(self._mlist.data_path), []) def test_non_ascii_message(self): # Subscribe some users receiving digests. |