[Zope3-checkins] SVN: Zope3/trunk/src/zope/component/bbb/tests/test_ Fixed another 5 test failures with "-N 2". I think this should be all,

[Stephan Richter]

Log message for revision 29930:
  Fixed another 5 test failures with "-N 2". I think this should be all, 
  except for some ZODB problems, which I will report to the mailing list.
  

Changed:
  U   Zope3/trunk/src/zope/component/bbb/tests/test_api.py
  U   Zope3/trunk/src/zope/component/bbb/tests/test_service.py

-=-
Modified: Zope3/trunk/src/zope/component/bbb/tests/test_api.py
===================================================================
--- Zope3/trunk/src/zope/component/bbb/tests/test_api.py	2005-04-09 13:48:10 UTC (rev 29929)
+++ Zope3/trunk/src/zope/component/bbb/tests/test_api.py	2005-04-09 17:40:14 UTC (rev 29930)
@@ -457,8 +457,8 @@
             ['object', '', 'request', 'default', 'providing', 'context'])
 
         # restore zope.component
-        zope.component.getView = savedGetView
-        zope.component.queryView = savedQueryView
+        zope.component.bbb.getView = savedGetView
+        zope.component.bbb.queryView = savedQueryView
 
     def testResource(self):
         from zope.component import getResource, queryResource, getService

Modified: Zope3/trunk/src/zope/component/bbb/tests/test_service.py
===================================================================
--- Zope3/trunk/src/zope/component/bbb/tests/test_service.py	2005-04-09 13:48:10 UTC (rev 29929)
+++ Zope3/trunk/src/zope/component/bbb/tests/test_service.py	2005-04-09 17:40:14 UTC (rev 29930)
@@ -49,8 +49,11 @@
         bbb.__warn__ = False
         bbb.service.__warn__ = False
 
-    def cleanUp(self):
+    def tearDown(self):
         super(Test, self).cleanUp()
+        # Make sure that the testServiceManager is clean
+        global testServiceManager
+        testServiceManager.sm.__init__(testServiceManager.sm.__name__)
         from zope.component import bbb
         bbb.__warn__ = True
         bbb.service.__warn__ = True
@@ -142,9 +145,9 @@
 
 
 def test_suite():
-    loader = unittest.TestLoader()
-    return loader.loadTestsFromTestCase(Test)
+    return unittest.TestSuite((
+        unittest.makeSuite(Test),
+                           ))
 
-
 if __name__ == '__main__':
-    unittest.TextTestRunner().run(test_suite())
+    unittest.main(defaultTest='test_suite')