[Checkins] SVN: BTrees/branches/pure_python/ Test conflict resolution for pure-Python OO entities.
Tres Seaver
cvs-admin at zope.org
Mon Nov 12 22:48:41 UTC 2012
Log message for revision 128264:
Test conflict resolution for pure-Python OO entities.
Changed:
_U BTrees/branches/pure_python/
U BTrees/branches/pure_python/BTrees/_base.py
U BTrees/branches/pure_python/BTrees/tests/test_OOBTree.py
-=-
Modified: BTrees/branches/pure_python/BTrees/_base.py
===================================================================
--- BTrees/branches/pure_python/BTrees/_base.py 2012-11-12 22:48:40 UTC (rev 128263)
+++ BTrees/branches/pure_python/BTrees/_base.py 2012-11-12 22:48:41 UTC (rev 128264)
@@ -145,7 +145,7 @@
has_key = __contains__
def _p_resolveConflict(self, *states):
- is_set = getattr(self, '_values', None) is not None
+ is_set = getattr(self, '_values', None) is None
buckets = []
for state in states:
Modified: BTrees/branches/pure_python/BTrees/tests/test_OOBTree.py
===================================================================
--- BTrees/branches/pure_python/BTrees/tests/test_OOBTree.py 2012-11-12 22:48:40 UTC (rev 128263)
+++ BTrees/branches/pure_python/BTrees/tests/test_OOBTree.py 2012-11-12 22:48:41 UTC (rev 128264)
@@ -202,6 +202,13 @@
return OOBucket
+class OOBucketPyConflictTests(MappingConflictTestBase, unittest.TestCase):
+
+ def _getTargetClass(self):
+ from BTrees.OOBTree import OOBucketPy
+ return OOBucketPy
+
+
class OOSetConflictTests(SetConflictTestBase, unittest.TestCase):
def _getTargetClass(self):
@@ -209,6 +216,13 @@
return OOSet
+class OOSetPyConflictTests(SetConflictTestBase, unittest.TestCase):
+
+ def _getTargetClass(self):
+ from BTrees.OOBTree import OOSetPy
+ return OOSetPy
+
+
class OOBTreeConflictTests(MappingConflictTestBase, unittest.TestCase):
def _getTargetClass(self):
@@ -216,6 +230,13 @@
return OOBTree
+class OOBTreePyConflictTests(MappingConflictTestBase, unittest.TestCase):
+
+ def _getTargetClass(self):
+ from BTrees.OOBTree import OOBTreePy
+ return OOBTreePy
+
+
class OOTreeSetConflictTests(SetConflictTestBase, unittest.TestCase):
def _getTargetClass(self):
@@ -223,6 +244,13 @@
return OOTreeSet
+class OOTreeSetPyConflictTests(SetConflictTestBase, unittest.TestCase):
+
+ def _getTargetClass(self):
+ from BTrees.OOBTree import OOTreeSetPy
+ return OOTreeSetPy
+
+
class OOModuleTest(ModuleTest, unittest.TestCase):
prefix = 'OO'
@@ -277,8 +305,12 @@
unittest.makeSuite(PureOO),
unittest.makeSuite(PureOOPy),
unittest.makeSuite(OOBucketConflictTests),
+ unittest.makeSuite(OOBucketPyConflictTests),
unittest.makeSuite(OOSetConflictTests),
+ unittest.makeSuite(OOSetPyConflictTests),
unittest.makeSuite(OOBTreeConflictTests),
+ unittest.makeSuite(OOBTreePyConflictTests),
unittest.makeSuite(OOTreeSetConflictTests),
+ unittest.makeSuite(OOTreeSetPyConflictTests),
unittest.makeSuite(OOModuleTest),
))
More information about the checkins
mailing list