summaryrefslogtreecommitdiff
path: root/service/test/support
diff options
context:
space:
mode:
authorFolker Bernitt <fbernitt@thoughtworks.com>2015-08-10 19:23:18 +0200
committerFolker Bernitt <fbernitt@thoughtworks.com>2015-08-11 17:00:34 +0200
commit9ed58715616f5c6341d32c9b0316933d3f2b4a3e (patch)
treeb6196bfce3bff26228afb942f75083b5f8fd9bcd /service/test/support
parentc00e4115f5bd205a0f65224dccd5e889e7cbf3b8 (diff)
Added test to ensure mail with same content can be added.
- as long as each one has a unique message id
Diffstat (limited to 'service/test/support')
-rw-r--r--service/test/support/integration/util.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/service/test/support/integration/util.py b/service/test/support/integration/util.py
index 2049105d..302edeaa 100644
--- a/service/test/support/integration/util.py
+++ b/service/test/support/integration/util.py
@@ -14,13 +14,18 @@
# You should have received a copy of the GNU Affero General Public License
# along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
from email.parser import Parser
+from email.utils import make_msgid
import os
import pkg_resources
-def load_mail_from_file(mail_file):
+def load_mail_from_file(mail_file, enforceUniqueMessageId=False):
mailset_dir = pkg_resources.resource_filename('test.unit.fixtures', 'mailset')
mail_file = os.path.join(mailset_dir, 'new', mail_file)
with open(mail_file) as f:
mail = Parser().parse(f)
+
+ if enforceUniqueMessageId:
+ mail.add_header('Message-Id', make_msgid())
+
return mail