Test cleanups.

BTrees/check.py

@@ -42,7 +42,8 @@ from BTrees.LOBTree import LOBTree, LOBucket, LOSet, LOTreeSet
 from BTrees.LLBTree import LLBTree, LLBucket, LLSet, LLTreeSet
 from BTrees.LFBTree import LFBTree, LFBucket, LFSet, LFTreeSet
 
-from ZODB.utils import positive_id, oid_repr
+from BTrees.utils import positive_id
+from BTrees.utils import oid_repr
 
 TYPE_UNKNOWN, TYPE_BTREE, TYPE_BUCKET = range(3)
 

BTrees/tests/testBTreesUnicode.py

@@ -68,9 +68,3 @@ class TestBTreesUnicode(unittest.TestCase):
 
 def test_suite():
     return unittest.makeSuite(TestBTreesUnicode)
-
-def main():
-    unittest.TextTestRunner().run(test_suite())
-
-if __name__ == '__main__':
-    main()

BTrees/tests/testSetOps.py

@@ -570,9 +570,3 @@ def test_suite():
         ):
         s.addTest(makeSuite(klass))
     return s
-
-def main():
-    TextTestRunner().run(test_suite())
-
-if __name__ == '__main__':
-    main()