From 20bda7007c6c8546ab403d65e8bf9e0bdfe4ad50 Mon Sep 17 00:00:00 2001
From: Aurélien Bompard
Date: Fri, 16 Sep 2016 12:32:44 +0200
Subject: Remove digest mbox after sending it

Fixes #259
---
 src/mailman/runners/digest.py            | 3 +++
 src/mailman/runners/tests/test_digest.py | 3 +++
 2 files changed, 6 insertions(+)

(limited to 'src')

diff --git a/src/mailman/runners/digest.py b/src/mailman/runners/digest.py
index c591c10a9..4173d9673 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
 
@@ -322,6 +323,8 @@ 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()
diff --git a/src/mailman/runners/tests/test_digest.py b/src/mailman/runners/tests/test_digest.py
index 6157f500b..f0993cff3 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 must have been removed (GL#259)
+        self.assertFalse(os.path.exists(
+            os.path.join(self._mlist.data_path, 'digest.mmdf')))
 
     def test_non_ascii_message(self):
         # Subscribe some users receiving digests.
-- 
cgit v1.2.3-70-g09d2