[Zope-Checkins] CVS: Zope3/lib/python/Persistence/BTrees/tests - testConflict.py:1.1.2.2

[Jeremy Hylton]

Update of /cvs-repository/Zope3/lib/python/Persistence/BTrees/tests
In directory cvs.zope.org:/tmp/cvs-serv25345

Modified Files:
      Tag: Zope-3x-branch
	testConflict.py 
Log Message:
Fiddle BTrees test suite.

BTreesUnicode:
    Use assertEqual() instead of assert.
    Use assert for error checking instead of print.

Conflict:
    Re-enable tests.


=== Zope3/lib/python/Persistence/BTrees/tests/testConflict.py 1.1.2.1 => 1.1.2.2 ===
 
     def _setupConflict(self):
-        base=self.t
+        base = self.t
         d={}
         for i in range(20):
             d[random.randrange(-10000, 10001)]=i*100000
@@ -222,11 +222,11 @@
         e2=e2.keys()
 
         base.update(d.keys())
-        b1=base.__class__(base)
-        b2=base.__class__(base)
-        bm=base.__class__(base)
+        b1 = base.__class__(base)
+        b2 = base.__class__(base)
+        bm = base.__class__(base)
 
-        items=base.keys()
+        items = base.keys()
 
         return  base, b1, b2, bm, e1, e2, items
 
@@ -402,7 +402,7 @@
         self.t = OIBucket()
 
 # XXX disable tests for now
-def _test_suite():
+def test_suite():
     TIOBTree = makeSuite(TestIOBTrees, 'test')
     TOOBTree = makeSuite(TestOOBTrees, 'test')
     TOIBTree = makeSuite(TestOIBTrees, 'test')