Some cleanup and provide an explicit test_suite function, the automatic...

Some cleanup and provide an explicit test_suite function, the automatic discovery and ZopeTestCase don't seem to like each other

src/App/tests/test_setConfiguration.py

@@ -15,10 +15,6 @@
 """
 import unittest
 
-import Testing
-#import Zope2
-#Zope2.startup()
-
 from Testing.ZopeTestCase.layer import ZopeLite
 
 
@@ -109,6 +105,3 @@ def test_suite():
     suite = unittest.TestSuite()
     suite.addTest(unittest.makeSuite(SetConfigTests))
     return suite
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='test_suite')

src/Zope2/App/tests/testDoomedTransaction.py

@@ -12,9 +12,7 @@
 #
 ##############################################################################
 
-import sys
 import unittest
-import logging
 import transaction
 
 class DoomedTransactionInManagerTest(unittest.TestCase):
@@ -33,11 +31,8 @@ class DoomedTransactionInManagerTest(unittest.TestCase):
         trans = transaction.get()
         trans.doom()
         tm.commit()
-        
+
 def test_suite():
     suite = unittest.TestSuite()
     suite.addTest(unittest.makeSuite(DoomedTransactionInManagerTest))
     return suite
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='test_suite')

src/Zope2/App/tests/test_startup.py

@@ -12,6 +12,7 @@
 ##############################################################################
 
 import logging
+import unittest
 
 from Testing.ZopeTestCase import ZopeTestCase
 
@@ -61,3 +62,9 @@ class StartupTests(ZopeTestCase):
         provideHandler(logevent, [IDatabaseOpened])
         startup()
         self.assertEqual(str(handler), logged)
+
+
+def test_suite():
+    suite = unittest.TestSuite()
+    suite.addTest(unittest.makeSuite(StartupTests))
+    return suite