summaryrefslogtreecommitdiff
path: root/src/mailman/runners
diff options
context:
space:
mode:
authorMark Sapiro2016-11-01 11:51:17 -0700
committerMark Sapiro2016-11-01 11:51:17 -0700
commit2adcc70b65749c8fe616ac61c93765aade75c783 (patch)
treec3fcf0531d68f4f14ee59de1c911460b7ee3a56f /src/mailman/runners
parentc77e6918d80a5aeab557f9f171594c858ef926f5 (diff)
parent366dc6517716b7c77c4b7a76559b1b6b5996fc8e (diff)
downloadmailman-2adcc70b65749c8fe616ac61c93765aade75c783.tar.gz
mailman-2adcc70b65749c8fe616ac61c93765aade75c783.tar.zst
mailman-2adcc70b65749c8fe616ac61c93765aade75c783.zip
Merge gitlab.com:mailman/mailman into dmarc
Diffstat (limited to 'src/mailman/runners')
-rw-r--r--src/mailman/runners/digest.py3
-rw-r--r--src/mailman/runners/tests/test_digest.py3
2 files changed, 6 insertions, 0 deletions
diff --git a/src/mailman/runners/digest.py b/src/mailman/runners/digest.py
index c591c10a9..4971965fa 100644
--- a/src/mailman/runners/digest.py
+++ b/src/mailman/runners/digest.py
@@ -17,6 +17,7 @@
"""Digest runner."""
+import os
import re
import logging
@@ -369,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 6157f500b..5246ef670 100644
--- a/src/mailman/runners/tests/test_digest.py
+++ b/src/mailman/runners/tests/test_digest.py
@@ -75,6 +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 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.