[Checkins] SVN: zc.queue/trunk/ Fixed undefined name ZODB.POSException.StorageTransactionError in tests.
Maurits van Rees
m.van.rees at zestsoftware.nl
Sat Dec 17 03:35:06 UTC 2011
Log message for revision 123824:
Fixed undefined name ZODB.POSException.StorageTransactionError in tests.
Changed:
U zc.queue/trunk/CHANGES.txt
U zc.queue/trunk/src/zc/queue/tests.py
-=-
Modified: zc.queue/trunk/CHANGES.txt
===================================================================
--- zc.queue/trunk/CHANGES.txt 2011-12-17 03:24:52 UTC (rev 123823)
+++ zc.queue/trunk/CHANGES.txt 2011-12-17 03:35:06 UTC (rev 123824)
@@ -5,6 +5,8 @@
1.2 (unreleased)
================
+- Fixed undefined ZODB.POSException.StorageTransactionError in tests.
+
- Let tests pass with ZODB 3.8 and ZODB 3.9.
- Added test extra to declare test dependency on ``zope.testing``.
Modified: zc.queue/trunk/src/zc/queue/tests.py
===================================================================
--- zc.queue/trunk/src/zc/queue/tests.py 2011-12-17 03:24:52 UTC (rev 123823)
+++ zc.queue/trunk/src/zc/queue/tests.py 2011-12-17 03:35:06 UTC (rev 123824)
@@ -1,6 +1,5 @@
from ZODB import ConflictResolution, MappingStorage, POSException
from zc import queue
-from zope.testing import module
import doctest
import unittest
@@ -17,6 +16,7 @@
# with transaction managers and all: this gives a clearer picture of the
# full context in which this conflict resolution code must dance.
+
class ConflictResolvingMappingStorage_38(
MappingStorage.MappingStorage,
ConflictResolution.ConflictResolvingStorage):
@@ -74,7 +74,7 @@
def store(self, oid, serial, data, version, transaction):
assert not version, "Versions are not supported"
if transaction is not self._transaction:
- raise ZODB.POSException.StorageTransactionError(self, transaction)
+ raise POSException.StorageTransactionError(self, transaction)
old_tid = None
tid_data = self._data.get(oid)
@@ -153,6 +153,7 @@
"""
+
def test_legacy():
"""We used to promote the names PersistentQueue and
CompositePersistentQueue as the expected names for the classes in this
@@ -167,13 +168,14 @@
"""
+
def test_suite():
return unittest.TestSuite((
doctest.DocFileSuite(
- 'queue.txt', globs={'Queue':queue.Queue}),
+ 'queue.txt', globs={'Queue': queue.Queue}),
doctest.DocFileSuite(
'queue.txt',
- globs={'Queue':lambda: queue.CompositeQueue(2)}),
+ globs={'Queue': lambda: queue.CompositeQueue(2)}),
doctest.DocTestSuite()
))
More information about the checkins
mailing list