Log message for revision 97640: Remove testrunner boilerplate. Changed: U Zope/trunk/src/Testing/ZopeTestCase/testBaseTestCase.py U Zope/trunk/src/Testing/ZopeTestCase/testFunctional.py U Zope/trunk/src/Testing/ZopeTestCase/testInterfaces.py U Zope/trunk/src/Testing/ZopeTestCase/testPlaceless.py U Zope/trunk/src/Testing/ZopeTestCase/testPortalTestCase.py U Zope/trunk/src/Testing/ZopeTestCase/testPythonScript.py U Zope/trunk/src/Testing/ZopeTestCase/testSkeleton.py U Zope/trunk/src/Testing/ZopeTestCase/testWebserver.py U Zope/trunk/src/Testing/ZopeTestCase/testZODBCompat.py U Zope/trunk/src/Testing/ZopeTestCase/testZopeTestCase.py U Zope/trunk/src/Testing/ZopeTestCase/zopedoctest/testAuthHeaderTest.py U Zope/trunk/src/Testing/ZopeTestCase/zopedoctest/testFunctionalDocTest.py U Zope/trunk/src/Testing/ZopeTestCase/zopedoctest/testPackageAsProduct.py U Zope/trunk/src/Testing/ZopeTestCase/zopedoctest/testWarningsTest.py U Zope/trunk/src/Testing/ZopeTestCase/zopedoctest/testZopeDocTest.py
-=- Modified: Zope/trunk/src/Testing/ZopeTestCase/testBaseTestCase.py =================================================================== --- Zope/trunk/src/Testing/ZopeTestCase/testBaseTestCase.py 2009-03-07 21:16:37 UTC (rev 97639) +++ Zope/trunk/src/Testing/ZopeTestCase/testBaseTestCase.py 2009-03-07 21:48:23 UTC (rev 97640) @@ -21,10 +21,6 @@ $Id$ """ -import os, sys -if __name__ == '__main__': - execfile(os.path.join(sys.path[0], 'framework.py')) - import transaction from Testing.ZopeTestCase import base @@ -463,6 +459,3 @@ suite.addTest(makeSuite(TestRequestGarbage3)) return suite -if __name__ == '__main__': - framework() - Modified: Zope/trunk/src/Testing/ZopeTestCase/testFunctional.py =================================================================== --- Zope/trunk/src/Testing/ZopeTestCase/testFunctional.py 2009-03-07 21:16:37 UTC (rev 97639) +++ Zope/trunk/src/Testing/ZopeTestCase/testFunctional.py 2009-03-07 21:48:23 UTC (rev 97640) @@ -18,10 +18,6 @@ $Id$ """ -import os, sys -if __name__ == '__main__': - execfile(os.path.join(sys.path[0], 'framework.py')) - from Testing import ZopeTestCase ZopeTestCase.installProduct('PythonScripts') @@ -206,6 +202,3 @@ suite.addTest(makeSuite(TestFunctional)) return suite -if __name__ == '__main__': - framework() - Modified: Zope/trunk/src/Testing/ZopeTestCase/testInterfaces.py =================================================================== --- Zope/trunk/src/Testing/ZopeTestCase/testInterfaces.py 2009-03-07 21:16:37 UTC (rev 97639) +++ Zope/trunk/src/Testing/ZopeTestCase/testInterfaces.py 2009-03-07 21:48:23 UTC (rev 97640) @@ -15,10 +15,6 @@ $Id$ """ -import os, sys -if __name__ == '__main__': - execfile(os.path.join(sys.path[0], 'framework.py')) - from Testing.ZopeTestCase import * from Testing.ZopeTestCase.interfaces import * @@ -99,6 +95,3 @@ suite.addTest(makeSuite(TestPortalTestCase)) return suite -if __name__ == '__main__': - framework() - Modified: Zope/trunk/src/Testing/ZopeTestCase/testPlaceless.py =================================================================== --- Zope/trunk/src/Testing/ZopeTestCase/testPlaceless.py 2009-03-07 21:16:37 UTC (rev 97639) +++ Zope/trunk/src/Testing/ZopeTestCase/testPlaceless.py 2009-03-07 21:48:23 UTC (rev 97640) @@ -15,10 +15,6 @@ $Id$ """ -import os, sys -if __name__ == '__main__': - execfile(os.path.join(sys.path[0], 'framework.py')) - from Testing import ZopeTestCase from Testing.ZopeTestCase.placeless import setUp, tearDown @@ -92,6 +88,3 @@ suite.addTest(makeSuite(TestPlacelessSetUp)) return suite -if __name__ == '__main__': - framework() - Modified: Zope/trunk/src/Testing/ZopeTestCase/testPortalTestCase.py =================================================================== --- Zope/trunk/src/Testing/ZopeTestCase/testPortalTestCase.py 2009-03-07 21:16:37 UTC (rev 97639) +++ Zope/trunk/src/Testing/ZopeTestCase/testPortalTestCase.py 2009-03-07 21:48:23 UTC (rev 97640) @@ -21,10 +21,6 @@ $Id$ """ -import os, sys -if __name__ == '__main__': - execfile(os.path.join(sys.path[0], 'framework.py')) - from Testing import ZopeTestCase from Acquisition import aq_base @@ -523,6 +519,3 @@ suite.addTest(makeSuite(TestSetUpRaises)) return suite -if __name__ == '__main__': - framework() - Modified: Zope/trunk/src/Testing/ZopeTestCase/testPythonScript.py =================================================================== --- Zope/trunk/src/Testing/ZopeTestCase/testPythonScript.py 2009-03-07 21:16:37 UTC (rev 97639) +++ Zope/trunk/src/Testing/ZopeTestCase/testPythonScript.py 2009-03-07 21:48:23 UTC (rev 97640) @@ -25,10 +25,6 @@ $Id$ """ -import os, sys -if __name__ == '__main__': - execfile(os.path.join(sys.path[0], 'framework.py')) - from Testing import ZopeTestCase ZopeTestCase.installProduct('PythonScripts') @@ -197,6 +193,3 @@ suite.addTest(makeSuite(TestPythonScript)) return suite -if __name__ == '__main__': - framework() - Modified: Zope/trunk/src/Testing/ZopeTestCase/testSkeleton.py =================================================================== --- Zope/trunk/src/Testing/ZopeTestCase/testSkeleton.py 2009-03-07 21:16:37 UTC (rev 97639) +++ Zope/trunk/src/Testing/ZopeTestCase/testSkeleton.py 2009-03-07 21:48:23 UTC (rev 97640) @@ -15,10 +15,6 @@ $Id$ """ -import os, sys -if __name__ == '__main__': - execfile(os.path.join(sys.path[0], 'framework.py')) - from Testing import ZopeTestCase ZopeTestCase.installProduct('SomeProduct') @@ -40,6 +36,3 @@ suite.addTest(makeSuite(TestSomeProduct)) return suite -if __name__ == '__main__': - framework() - Modified: Zope/trunk/src/Testing/ZopeTestCase/testWebserver.py =================================================================== --- Zope/trunk/src/Testing/ZopeTestCase/testWebserver.py 2009-03-07 21:16:37 UTC (rev 97639) +++ Zope/trunk/src/Testing/ZopeTestCase/testWebserver.py 2009-03-07 21:48:23 UTC (rev 97640) @@ -29,13 +29,6 @@ $Id$ """ -import os, sys -if __name__ == '__main__': - execfile(os.path.join(sys.path[0], 'framework.py')) - -#os.environ['STUPID_LOG_FILE'] = os.path.join(os.getcwd(), 'zLOG.log') -#os.environ['STUPID_LOG_SEVERITY'] = '0' - from Testing import ZopeTestCase from Testing.ZopeTestCase import transaction @@ -199,6 +192,3 @@ suite.addTest(makeSuite(TestSandboxedWebserver)) return suite -if __name__ == '__main__': - framework() - Modified: Zope/trunk/src/Testing/ZopeTestCase/testZODBCompat.py =================================================================== --- Zope/trunk/src/Testing/ZopeTestCase/testZODBCompat.py 2009-03-07 21:16:37 UTC (rev 97639) +++ Zope/trunk/src/Testing/ZopeTestCase/testZODBCompat.py 2009-03-07 21:48:23 UTC (rev 97640) @@ -19,9 +19,7 @@ $Id$ """ -import os, sys -if __name__ == '__main__': - execfile(os.path.join(sys.path[0], 'framework.py')) +import os from Testing import ZopeTestCase @@ -380,6 +378,3 @@ suite.addTest(makeSuite(TestTransactionAbort)) return suite -if __name__ == '__main__': - framework() - Modified: Zope/trunk/src/Testing/ZopeTestCase/testZopeTestCase.py =================================================================== --- Zope/trunk/src/Testing/ZopeTestCase/testZopeTestCase.py 2009-03-07 21:16:37 UTC (rev 97639) +++ Zope/trunk/src/Testing/ZopeTestCase/testZopeTestCase.py 2009-03-07 21:48:23 UTC (rev 97640) @@ -21,10 +21,6 @@ $Id$ """ -import os, sys -if __name__ == '__main__': - execfile(os.path.join(sys.path[0], 'framework.py')) - from Testing import ZopeTestCase from Testing.ZopeTestCase import folder_name @@ -408,6 +404,3 @@ suite.addTest(makeSuite(TestWrappingUserFolder)) return suite -if __name__ == '__main__': - framework() - Modified: Zope/trunk/src/Testing/ZopeTestCase/zopedoctest/testAuthHeaderTest.py =================================================================== --- Zope/trunk/src/Testing/ZopeTestCase/zopedoctest/testAuthHeaderTest.py 2009-03-07 21:16:37 UTC (rev 97639) +++ Zope/trunk/src/Testing/ZopeTestCase/zopedoctest/testAuthHeaderTest.py 2009-03-07 21:48:23 UTC (rev 97640) @@ -15,10 +15,6 @@ $Id$ """ -import os, sys -if __name__ == '__main__': - execfile(os.path.join(sys.path[0], 'framework.py')) - from unittest import TestSuite, makeSuite from Testing.ZopeTestCase import TestCase from Testing.ZopeTestCase import zopedoctest @@ -56,6 +52,3 @@ makeSuite(AuthHeaderTestCase), )) -if __name__ == '__main__': - framework() - Modified: Zope/trunk/src/Testing/ZopeTestCase/zopedoctest/testFunctionalDocTest.py =================================================================== --- Zope/trunk/src/Testing/ZopeTestCase/zopedoctest/testFunctionalDocTest.py 2009-03-07 21:16:37 UTC (rev 97639) +++ Zope/trunk/src/Testing/ZopeTestCase/zopedoctest/testFunctionalDocTest.py 2009-03-07 21:48:23 UTC (rev 97640) @@ -15,10 +15,6 @@ $Id$ """ -import os, sys -if __name__ == '__main__': - execfile(os.path.join(sys.path[0], 'framework.py')) - from unittest import TestSuite from Testing.ZopeTestCase import installProduct from Testing.ZopeTestCase import FunctionalDocTestSuite @@ -67,6 +63,3 @@ FunctionalDocFileSuite('FunctionalDocTest.txt', setUp=setUp), )) -if __name__ == '__main__': - framework() - Modified: Zope/trunk/src/Testing/ZopeTestCase/zopedoctest/testPackageAsProduct.py =================================================================== --- Zope/trunk/src/Testing/ZopeTestCase/zopedoctest/testPackageAsProduct.py 2009-03-07 21:16:37 UTC (rev 97639) +++ Zope/trunk/src/Testing/ZopeTestCase/zopedoctest/testPackageAsProduct.py 2009-03-07 21:48:23 UTC (rev 97640) @@ -15,10 +15,6 @@ $Id$ """ -import os, sys -if __name__ == '__main__': - execfile(os.path.join(sys.path[0], 'framework.py')) - from unittest import TestSuite from Testing import ZopeTestCase from Testing.ZopeTestCase import ZopeLite @@ -117,6 +113,3 @@ else: return TestSuite() -if __name__ == '__main__': - framework() - Modified: Zope/trunk/src/Testing/ZopeTestCase/zopedoctest/testWarningsTest.py =================================================================== --- Zope/trunk/src/Testing/ZopeTestCase/zopedoctest/testWarningsTest.py 2009-03-07 21:16:37 UTC (rev 97639) +++ Zope/trunk/src/Testing/ZopeTestCase/zopedoctest/testWarningsTest.py 2009-03-07 21:48:23 UTC (rev 97640) @@ -15,10 +15,6 @@ $Id$ """ -import os, sys -if __name__ == '__main__': - execfile(os.path.join(sys.path[0], 'framework.py')) - from unittest import TestSuite from Testing.ZopeTestCase import ZopeDocFileSuite @@ -28,6 +24,3 @@ ZopeDocFileSuite('WarningsTest.txt'), )) -if __name__ == '__main__': - framework() - Modified: Zope/trunk/src/Testing/ZopeTestCase/zopedoctest/testZopeDocTest.py =================================================================== --- Zope/trunk/src/Testing/ZopeTestCase/zopedoctest/testZopeDocTest.py 2009-03-07 21:16:37 UTC (rev 97639) +++ Zope/trunk/src/Testing/ZopeTestCase/zopedoctest/testZopeDocTest.py 2009-03-07 21:48:23 UTC (rev 97640) @@ -15,10 +15,6 @@ $Id$ """ -import os, sys -if __name__ == '__main__': - execfile(os.path.join(sys.path[0], 'framework.py')) - from unittest import TestSuite from Testing.ZopeTestCase import ZopeDocTestSuite from Testing.ZopeTestCase import ZopeDocFileSuite @@ -43,6 +39,3 @@ ZopeDocFileSuite('ZopeDocTest.txt', setUp=setUp), )) -if __name__ == '__main__': - framework() - _______________________________________________ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins