summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJens Vagelpohl <jens@netz.ooo>2006-04-03 10:03:14 +0000
committerJens Vagelpohl <jens@netz.ooo>2006-04-03 10:03:14 +0000
commitcf9268fedc2d3071643a3731c6104a3f5bbaae3f (patch)
tree349b01615913249661e80af00c746ffdf9187759
parentdd3d7deb2541c0be4644fe86151409f767e6a785 (diff)
downloadMaildropHost-cf9268fedc2d3071643a3731c6104a3f5bbaae3f.zip
MaildropHost-cf9268fedc2d3071643a3731c6104a3f5bbaae3f.tar.gz
- Squashed a deprecation warning in the Email unit tests (patch
by Chris Withers)
-rw-r--r--CHANGES.txt7
-rw-r--r--tests/test_Email.py7
2 files changed, 13 insertions, 1 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 60d11e1..841c3f0 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,12 @@
MaildropHost version and change information
+ MaildropHost 1.17 (unreleased)
+
+ * Bugs fixed
+
+ - Squashed a deprecation warning in the Email unit tests (patch
+ by Chris Withers)
+
MaildropHost 1.16 (2006/03/19)
* Bugs fixed
diff --git a/tests/test_Email.py b/tests/test_Email.py
index 2104b24..91fafe5 100644
--- a/tests/test_Email.py
+++ b/tests/test_Email.py
@@ -173,7 +173,12 @@ class TransactionalEmailTests(EmailTestBase):
# Committing a subtransaction should not do anything. Both email file
# and lockfile should remain!
- get_transaction().commit(1)
+ try:
+ # Savepoints replace subtransactions in Zope 2.8+
+ get_transaction().savepoint(optimistic=True)
+ except AttributeError:
+ # Zope 2.7 and earlier don't know savepoints.
+ get_transaction().commit(1)
self.assertEquals(len(_listSpools()), 2)
# abort the current transaction, which will clean the spool as well