Log message for revision 90441: Removed old framework testrunner and removed references to software home.
Changed: U Zope/trunk/lib/python/Products/Five/browser/tests/cps_test_localizer.py D Zope/trunk/lib/python/Products/Five/browser/tests/framework.py U Zope/trunk/lib/python/Products/Five/browser/tests/pts_test_languages.py U Zope/trunk/lib/python/Products/Five/browser/tests/test_absoluteurl.py U Zope/trunk/lib/python/Products/Five/browser/tests/test_adding.py U Zope/trunk/lib/python/Products/Five/browser/tests/test_decode.py U Zope/trunk/lib/python/Products/Five/browser/tests/test_defaultview.py U Zope/trunk/lib/python/Products/Five/browser/tests/test_i18n.py U Zope/trunk/lib/python/Products/Five/browser/tests/test_menu.py U Zope/trunk/lib/python/Products/Five/browser/tests/test_pages.py U Zope/trunk/lib/python/Products/Five/browser/tests/test_provider.py U Zope/trunk/lib/python/Products/Five/browser/tests/test_recurse.py U Zope/trunk/lib/python/Products/Five/browser/tests/test_resource.py U Zope/trunk/lib/python/Products/Five/browser/tests/test_skin.py U Zope/trunk/lib/python/Products/Five/browser/tests/test_traversable.py U Zope/trunk/lib/python/Products/Five/browser/tests/test_zope3security.py D Zope/trunk/lib/python/Products/Five/form/tests/framework.py U Zope/trunk/lib/python/Products/Five/form/tests/test_forms.py D Zope/trunk/lib/python/Products/Five/formlib/tests/framework.py U Zope/trunk/lib/python/Products/Five/formlib/tests/test_formlib.py D Zope/trunk/lib/python/Products/Five/skin/tests/framework.py U Zope/trunk/lib/python/Products/Five/skin/tests/test_standardmacros.py U Zope/trunk/lib/python/Products/Five/tests/boilerplate.py D Zope/trunk/lib/python/Products/Five/tests/framework.py U Zope/trunk/lib/python/Products/Five/tests/test_directives.py U Zope/trunk/lib/python/Products/Five/tests/test_event.py U Zope/trunk/lib/python/Products/Five/tests/test_i18n.py U Zope/trunk/lib/python/Products/Five/tests/test_registerclass.py U Zope/trunk/lib/python/Products/Five/tests/test_registerpackage.py U Zope/trunk/lib/python/Products/Five/tests/test_security.py U Zope/trunk/lib/python/Products/Five/tests/test_size.py D Zope/trunk/lib/python/Products/Five/utilities/browser/tests/framework.py U Zope/trunk/lib/python/Products/Five/utilities/browser/tests/test_marker.py U Zope/trunk/lib/python/Products/Five/zcml.py U Zope/trunk/lib/python/Products/OFSP/help/Control-Panel_Contents.stx -=- Modified: Zope/trunk/lib/python/Products/Five/browser/tests/cps_test_localizer.py =================================================================== --- Zope/trunk/lib/python/Products/Five/browser/tests/cps_test_localizer.py 2008-08-27 12:36:47 UTC (rev 90440) +++ Zope/trunk/lib/python/Products/Five/browser/tests/cps_test_localizer.py 2008-08-27 12:45:41 UTC (rev 90441) @@ -17,9 +17,6 @@ $Id$ """ -import os, sys -if __name__ == '__main__': - execfile(os.path.join(sys.path[0], 'framework.py')) def test_suite(): from Testing.ZopeTestCase import installProduct, FunctionalDocFileSuite @@ -56,6 +53,3 @@ return FunctionalDocFileSuite('cps_test_localizer.txt', package='Products.Five.browser.tests') - -if __name__ == '__main__': - framework() Deleted: Zope/trunk/lib/python/Products/Five/browser/tests/framework.py =================================================================== --- Zope/trunk/lib/python/Products/Five/browser/tests/framework.py 2008-08-27 12:36:47 UTC (rev 90440) +++ Zope/trunk/lib/python/Products/Five/browser/tests/framework.py 2008-08-27 12:45:41 UTC (rev 90441) @@ -1,107 +0,0 @@ -############################################################################## -# -# ZopeTestCase -# -# COPY THIS FILE TO YOUR 'tests' DIRECTORY. -# -# This version of framework.py will use the SOFTWARE_HOME -# environment variable to locate Zope and the Testing package. -# -# If the tests are run in an INSTANCE_HOME installation of Zope, -# Products.__path__ and sys.path with be adjusted to include the -# instance's Products and lib/python directories respectively. -# -# If you explicitly set INSTANCE_HOME prior to running the tests, -# auto-detection is disabled and the specified path will be used -# instead. -# -# If the 'tests' directory contains a custom_zodb.py file, INSTANCE_HOME -# will be adjusted to use it. -# -# If you set the ZEO_INSTANCE_HOME environment variable a ZEO setup -# is assumed, and you can attach to a running ZEO server (via the -# instance's custom_zodb.py). -# -############################################################################## -# -# The following code should be at the top of every test module: -# -# import os, sys -# if __name__ == '__main__': -# execfile(os.path.join(sys.path[0], 'framework.py')) -# -# ...and the following at the bottom: -# -# if __name__ == '__main__': -# framework() -# -############################################################################## - -__version__ = '0.2.3' - -# Save start state -# -__SOFTWARE_HOME = os.environ.get('SOFTWARE_HOME', '') -__INSTANCE_HOME = os.environ.get('INSTANCE_HOME', '') - -if __SOFTWARE_HOME.endswith(os.sep): - __SOFTWARE_HOME = os.path.dirname(__SOFTWARE_HOME) - -if __INSTANCE_HOME.endswith(os.sep): - __INSTANCE_HOME = os.path.dirname(__INSTANCE_HOME) - -# Find and import the Testing package -# -if not sys.modules.has_key('Testing'): - p0 = sys.path[0] - if p0 and __name__ == '__main__': - os.chdir(p0) - p0 = '' - s = __SOFTWARE_HOME - p = d = s and s or os.getcwd() - while d: - if os.path.isdir(os.path.join(p, 'Testing')): - zope_home = os.path.dirname(os.path.dirname(p)) - sys.path[:1] = [p0, p, zope_home] - break - p, d = s and ('','') or os.path.split(p) - else: - print 'Unable to locate Testing package.', - print 'You might need to set SOFTWARE_HOME.' - sys.exit(1) - -import Testing, unittest -execfile(os.path.join(os.path.dirname(Testing.__file__), 'common.py')) - -# Include ZopeTestCase support -# -if 1: # Create a new scope - - p = os.path.join(os.path.dirname(Testing.__file__), 'ZopeTestCase') - - if not os.path.isdir(p): - print 'Unable to locate ZopeTestCase package.', - print 'You might need to install ZopeTestCase.' - sys.exit(1) - - ztc_common = 'ztc_common.py' - ztc_common_global = os.path.join(p, ztc_common) - - f = 0 - if os.path.exists(ztc_common_global): - execfile(ztc_common_global) - f = 1 - if os.path.exists(ztc_common): - execfile(ztc_common) - f = 1 - - if not f: - print 'Unable to locate %s.' % ztc_common - sys.exit(1) - -# Debug -# -print 'SOFTWARE_HOME: %s' % os.environ.get('SOFTWARE_HOME', 'Not set') -print 'INSTANCE_HOME: %s' % os.environ.get('INSTANCE_HOME', 'Not set') -sys.stdout.flush() - Modified: Zope/trunk/lib/python/Products/Five/browser/tests/pts_test_languages.py =================================================================== --- Zope/trunk/lib/python/Products/Five/browser/tests/pts_test_languages.py 2008-08-27 12:36:47 UTC (rev 90440) +++ Zope/trunk/lib/python/Products/Five/browser/tests/pts_test_languages.py 2008-08-27 12:45:41 UTC (rev 90441) @@ -15,9 +15,6 @@ $Id$ """ -import os, sys -if __name__ == '__main__': - execfile(os.path.join(sys.path[0], 'framework.py')) def test_suite(): from Testing.ZopeTestCase import installProduct, FunctionalDocFileSuite @@ -25,6 +22,3 @@ installProduct('PlacelessTranslationService') return FunctionalDocFileSuite('pts_test_languages.txt', package='Products.Five.browser.tests') - -if __name__ == '__main__': - framework() Modified: Zope/trunk/lib/python/Products/Five/browser/tests/test_absoluteurl.py =================================================================== --- Zope/trunk/lib/python/Products/Five/browser/tests/test_absoluteurl.py 2008-08-27 12:36:47 UTC (rev 90440) +++ Zope/trunk/lib/python/Products/Five/browser/tests/test_absoluteurl.py 2008-08-27 12:45:41 UTC (rev 90441) @@ -15,9 +15,6 @@ $Id$ """ -import os, sys -if __name__ == '__main__': - execfile(os.path.join(sys.path[0], 'framework.py')) def test_absoluteurl(): """This tests the absolute url view (IAbsoluteURL or @@absolute_url), @@ -91,6 +88,3 @@ def test_suite(): from Testing.ZopeTestCase import ZopeDocTestSuite return ZopeDocTestSuite() - -if __name__ == '__main__': - framework() Modified: Zope/trunk/lib/python/Products/Five/browser/tests/test_adding.py =================================================================== --- Zope/trunk/lib/python/Products/Five/browser/tests/test_adding.py 2008-08-27 12:36:47 UTC (rev 90440) +++ Zope/trunk/lib/python/Products/Five/browser/tests/test_adding.py 2008-08-27 12:45:41 UTC (rev 90441) @@ -15,14 +15,8 @@ $Id$ """ -import os, sys -if __name__ == '__main__': - execfile(os.path.join(sys.path[0], 'framework.py')) def test_suite(): from Testing.ZopeTestCase import ZopeDocFileSuite return ZopeDocFileSuite('adding.txt', package="Products.Five.browser.tests") - -if __name__ == '__main__': - framework() Modified: Zope/trunk/lib/python/Products/Five/browser/tests/test_decode.py =================================================================== --- Zope/trunk/lib/python/Products/Five/browser/tests/test_decode.py 2008-08-27 12:36:47 UTC (rev 90440) +++ Zope/trunk/lib/python/Products/Five/browser/tests/test_decode.py 2008-08-27 12:45:41 UTC (rev 90441) @@ -15,9 +15,6 @@ $Id$ """ -import os, sys -if __name__ == '__main__': - execfile(os.path.join(sys.path[0], 'framework.py')) def test_processInputs(): """ @@ -54,6 +51,3 @@ def test_suite(): from zope.testing.doctest import DocTestSuite return DocTestSuite() - -if __name__ == '__main__': - framework() Modified: Zope/trunk/lib/python/Products/Five/browser/tests/test_defaultview.py =================================================================== --- Zope/trunk/lib/python/Products/Five/browser/tests/test_defaultview.py 2008-08-27 12:36:47 UTC (rev 90440) +++ Zope/trunk/lib/python/Products/Five/browser/tests/test_defaultview.py 2008-08-27 12:45:41 UTC (rev 90441) @@ -15,9 +15,6 @@ $Id$ """ -import os, sys -if __name__ == '__main__': - execfile(os.path.join(sys.path[0], 'framework.py')) def test_default_view(): """ @@ -183,6 +180,3 @@ def test_suite(): from Testing.ZopeTestCase import FunctionalDocTestSuite return FunctionalDocTestSuite() - -if __name__ == '__main__': - framework() Modified: Zope/trunk/lib/python/Products/Five/browser/tests/test_i18n.py =================================================================== --- Zope/trunk/lib/python/Products/Five/browser/tests/test_i18n.py 2008-08-27 12:36:47 UTC (rev 90440) +++ Zope/trunk/lib/python/Products/Five/browser/tests/test_i18n.py 2008-08-27 12:45:41 UTC (rev 90441) @@ -15,9 +15,6 @@ $Id$ """ -import os, sys -if __name__ == '__main__': - execfile(os.path.join(sys.path[0], 'framework.py')) def test_zpt_i18n(): """ @@ -91,6 +88,3 @@ from Testing.ZopeTestCase import FunctionalDocTestSuite from zope.testing.doctest import ELLIPSIS return FunctionalDocTestSuite(optionflags=ELLIPSIS) - -if __name__ == '__main__': - framework() Modified: Zope/trunk/lib/python/Products/Five/browser/tests/test_menu.py =================================================================== --- Zope/trunk/lib/python/Products/Five/browser/tests/test_menu.py 2008-08-27 12:36:47 UTC (rev 90440) +++ Zope/trunk/lib/python/Products/Five/browser/tests/test_menu.py 2008-08-27 12:45:41 UTC (rev 90441) @@ -15,9 +15,6 @@ $Id$ """ -import os, sys -if __name__ == '__main__': - execfile(os.path.join(sys.path[0], 'framework.py')) def test_menu(): """ @@ -176,6 +173,3 @@ def test_suite(): from Testing.ZopeTestCase import ZopeDocTestSuite return ZopeDocTestSuite() - -if __name__ == '__main__': - framework() Modified: Zope/trunk/lib/python/Products/Five/browser/tests/test_pages.py =================================================================== --- Zope/trunk/lib/python/Products/Five/browser/tests/test_pages.py 2008-08-27 12:36:47 UTC (rev 90440) +++ Zope/trunk/lib/python/Products/Five/browser/tests/test_pages.py 2008-08-27 12:45:41 UTC (rev 90441) @@ -15,9 +15,6 @@ $Id$ """ -import os, sys -if __name__ == '__main__': - execfile(os.path.join(sys.path[0], 'framework.py')) def test_view_with_unwrapped_context(): """ @@ -82,6 +79,3 @@ package='Products.Five.browser.tests'), )) return suite - -if __name__ == '__main__': - framework() Modified: Zope/trunk/lib/python/Products/Five/browser/tests/test_provider.py =================================================================== --- Zope/trunk/lib/python/Products/Five/browser/tests/test_provider.py 2008-08-27 12:36:47 UTC (rev 90440) +++ Zope/trunk/lib/python/Products/Five/browser/tests/test_provider.py 2008-08-27 12:45:41 UTC (rev 90441) @@ -15,14 +15,8 @@ $Id$ """ -import os, sys -if __name__ == '__main__': - execfile(os.path.join(sys.path[0], 'framework.py')) def test_suite(): from Testing.ZopeTestCase import FunctionalDocFileSuite return FunctionalDocFileSuite('provider.txt', package='Products.Five.browser.tests') - -if __name__ == '__main__': - framework() Modified: Zope/trunk/lib/python/Products/Five/browser/tests/test_recurse.py =================================================================== --- Zope/trunk/lib/python/Products/Five/browser/tests/test_recurse.py 2008-08-27 12:36:47 UTC (rev 90440) +++ Zope/trunk/lib/python/Products/Five/browser/tests/test_recurse.py 2008-08-27 12:45:41 UTC (rev 90441) @@ -15,9 +15,6 @@ $Id$ """ -import os, sys -if __name__ == '__main__': - execfile(os.path.join(sys.path[0], 'framework.py')) def test_recursion(): """ @@ -67,6 +64,3 @@ def test_suite(): from Testing.ZopeTestCase import ZopeDocTestSuite return ZopeDocTestSuite() - -if __name__ == '__main__': - framework() Modified: Zope/trunk/lib/python/Products/Five/browser/tests/test_resource.py =================================================================== --- Zope/trunk/lib/python/Products/Five/browser/tests/test_resource.py 2008-08-27 12:36:47 UTC (rev 90440) +++ Zope/trunk/lib/python/Products/Five/browser/tests/test_resource.py 2008-08-27 12:45:41 UTC (rev 90441) @@ -15,9 +15,6 @@ $Id$ """ -import os, sys -if __name__ == '__main__': - execfile(os.path.join(sys.path[0], 'framework.py')) def test_suite(): import unittest @@ -30,6 +27,3 @@ FunctionalDocFileSuite('resource_ftest.txt', package='Products.Five.browser.tests'), )) - -if __name__ == '__main__': - framework() Modified: Zope/trunk/lib/python/Products/Five/browser/tests/test_skin.py =================================================================== --- Zope/trunk/lib/python/Products/Five/browser/tests/test_skin.py 2008-08-27 12:36:47 UTC (rev 90440) +++ Zope/trunk/lib/python/Products/Five/browser/tests/test_skin.py 2008-08-27 12:45:41 UTC (rev 90441) @@ -15,14 +15,8 @@ $Id$ """ -import os, sys -if __name__ == '__main__': - execfile(os.path.join(sys.path[0], 'framework.py')) def test_suite(): from Testing.ZopeTestCase import FunctionalDocFileSuite return FunctionalDocFileSuite('skin.txt', package='Products.Five.browser.tests') - -if __name__ == '__main__': - framework() Modified: Zope/trunk/lib/python/Products/Five/browser/tests/test_traversable.py =================================================================== --- Zope/trunk/lib/python/Products/Five/browser/tests/test_traversable.py 2008-08-27 12:36:47 UTC (rev 90440) +++ Zope/trunk/lib/python/Products/Five/browser/tests/test_traversable.py 2008-08-27 12:45:41 UTC (rev 90441) @@ -15,11 +15,7 @@ $Id$ """ -import os, sys -if __name__ == '__main__': - execfile(os.path.join(sys.path[0], 'framework.py')) - class SimpleClass(object): """Class with no __bobo_traverse__.""" @@ -289,6 +285,3 @@ def test_suite(): from Testing.ZopeTestCase import FunctionalDocTestSuite return FunctionalDocTestSuite() - -if __name__ == '__main__': - framework() Modified: Zope/trunk/lib/python/Products/Five/browser/tests/test_zope3security.py =================================================================== --- Zope/trunk/lib/python/Products/Five/browser/tests/test_zope3security.py 2008-08-27 12:36:47 UTC (rev 90440) +++ Zope/trunk/lib/python/Products/Five/browser/tests/test_zope3security.py 2008-08-27 12:45:41 UTC (rev 90441) @@ -1,6 +1,3 @@ -import os, sys -if __name__ == '__main__': - execfile(os.path.join(sys.path[0], 'framework.py')) def test_check_permission(): """Code (in Zope 3) often uses @@ -60,6 +57,3 @@ from Testing.ZopeTestCase import FunctionalDocTestSuite from zope.testing.doctest import ELLIPSIS return FunctionalDocTestSuite(optionflags=ELLIPSIS) - -if __name__ == '__main__': - framework() Deleted: Zope/trunk/lib/python/Products/Five/form/tests/framework.py =================================================================== --- Zope/trunk/lib/python/Products/Five/form/tests/framework.py 2008-08-27 12:36:47 UTC (rev 90440) +++ Zope/trunk/lib/python/Products/Five/form/tests/framework.py 2008-08-27 12:45:41 UTC (rev 90441) @@ -1,107 +0,0 @@ -############################################################################## -# -# ZopeTestCase -# -# COPY THIS FILE TO YOUR 'tests' DIRECTORY. -# -# This version of framework.py will use the SOFTWARE_HOME -# environment variable to locate Zope and the Testing package. -# -# If the tests are run in an INSTANCE_HOME installation of Zope, -# Products.__path__ and sys.path with be adjusted to include the -# instance's Products and lib/python directories respectively. -# -# If you explicitly set INSTANCE_HOME prior to running the tests, -# auto-detection is disabled and the specified path will be used -# instead. -# -# If the 'tests' directory contains a custom_zodb.py file, INSTANCE_HOME -# will be adjusted to use it. -# -# If you set the ZEO_INSTANCE_HOME environment variable a ZEO setup -# is assumed, and you can attach to a running ZEO server (via the -# instance's custom_zodb.py). -# -############################################################################## -# -# The following code should be at the top of every test module: -# -# import os, sys -# if __name__ == '__main__': -# execfile(os.path.join(sys.path[0], 'framework.py')) -# -# ...and the following at the bottom: -# -# if __name__ == '__main__': -# framework() -# -############################################################################## - -__version__ = '0.2.3' - -# Save start state -# -__SOFTWARE_HOME = os.environ.get('SOFTWARE_HOME', '') -__INSTANCE_HOME = os.environ.get('INSTANCE_HOME', '') - -if __SOFTWARE_HOME.endswith(os.sep): - __SOFTWARE_HOME = os.path.dirname(__SOFTWARE_HOME) - -if __INSTANCE_HOME.endswith(os.sep): - __INSTANCE_HOME = os.path.dirname(__INSTANCE_HOME) - -# Find and import the Testing package -# -if not sys.modules.has_key('Testing'): - p0 = sys.path[0] - if p0 and __name__ == '__main__': - os.chdir(p0) - p0 = '' - s = __SOFTWARE_HOME - p = d = s and s or os.getcwd() - while d: - if os.path.isdir(os.path.join(p, 'Testing')): - zope_home = os.path.dirname(os.path.dirname(p)) - sys.path[:1] = [p0, p, zope_home] - break - p, d = s and ('','') or os.path.split(p) - else: - print 'Unable to locate Testing package.', - print 'You might need to set SOFTWARE_HOME.' - sys.exit(1) - -import Testing, unittest -execfile(os.path.join(os.path.dirname(Testing.__file__), 'common.py')) - -# Include ZopeTestCase support -# -if 1: # Create a new scope - - p = os.path.join(os.path.dirname(Testing.__file__), 'ZopeTestCase') - - if not os.path.isdir(p): - print 'Unable to locate ZopeTestCase package.', - print 'You might need to install ZopeTestCase.' - sys.exit(1) - - ztc_common = 'ztc_common.py' - ztc_common_global = os.path.join(p, ztc_common) - - f = 0 - if os.path.exists(ztc_common_global): - execfile(ztc_common_global) - f = 1 - if os.path.exists(ztc_common): - execfile(ztc_common) - f = 1 - - if not f: - print 'Unable to locate %s.' % ztc_common - sys.exit(1) - -# Debug -# -print 'SOFTWARE_HOME: %s' % os.environ.get('SOFTWARE_HOME', 'Not set') -print 'INSTANCE_HOME: %s' % os.environ.get('INSTANCE_HOME', 'Not set') -sys.stdout.flush() - Modified: Zope/trunk/lib/python/Products/Five/form/tests/test_forms.py =================================================================== --- Zope/trunk/lib/python/Products/Five/form/tests/test_forms.py 2008-08-27 12:36:47 UTC (rev 90440) +++ Zope/trunk/lib/python/Products/Five/form/tests/test_forms.py 2008-08-27 12:45:41 UTC (rev 90441) @@ -15,9 +15,6 @@ $Id$ """ -import os, sys -if __name__ == '__main__': - execfile(os.path.join(sys.path[0], 'framework.py')) def test_get_widgets_for_schema_fields(): """ @@ -69,6 +66,3 @@ FunctionalDocFileSuite('forms.txt', package="Products.Five.form.tests",), )) - -if __name__ == '__main__': - framework() Deleted: Zope/trunk/lib/python/Products/Five/formlib/tests/framework.py =================================================================== --- Zope/trunk/lib/python/Products/Five/formlib/tests/framework.py 2008-08-27 12:36:47 UTC (rev 90440) +++ Zope/trunk/lib/python/Products/Five/formlib/tests/framework.py 2008-08-27 12:45:41 UTC (rev 90441) @@ -1,107 +0,0 @@ -############################################################################## -# -# ZopeTestCase -# -# COPY THIS FILE TO YOUR 'tests' DIRECTORY. -# -# This version of framework.py will use the SOFTWARE_HOME -# environment variable to locate Zope and the Testing package. -# -# If the tests are run in an INSTANCE_HOME installation of Zope, -# Products.__path__ and sys.path with be adjusted to include the -# instance's Products and lib/python directories respectively. -# -# If you explicitly set INSTANCE_HOME prior to running the tests, -# auto-detection is disabled and the specified path will be used -# instead. -# -# If the 'tests' directory contains a custom_zodb.py file, INSTANCE_HOME -# will be adjusted to use it. -# -# If you set the ZEO_INSTANCE_HOME environment variable a ZEO setup -# is assumed, and you can attach to a running ZEO server (via the -# instance's custom_zodb.py). -# -############################################################################## -# -# The following code should be at the top of every test module: -# -# import os, sys -# if __name__ == '__main__': -# execfile(os.path.join(sys.path[0], 'framework.py')) -# -# ...and the following at the bottom: -# -# if __name__ == '__main__': -# framework() -# -############################################################################## - -__version__ = '0.2.3' - -# Save start state -# -__SOFTWARE_HOME = os.environ.get('SOFTWARE_HOME', '') -__INSTANCE_HOME = os.environ.get('INSTANCE_HOME', '') - -if __SOFTWARE_HOME.endswith(os.sep): - __SOFTWARE_HOME = os.path.dirname(__SOFTWARE_HOME) - -if __INSTANCE_HOME.endswith(os.sep): - __INSTANCE_HOME = os.path.dirname(__INSTANCE_HOME) - -# Find and import the Testing package -# -if not sys.modules.has_key('Testing'): - p0 = sys.path[0] - if p0 and __name__ == '__main__': - os.chdir(p0) - p0 = '' - s = __SOFTWARE_HOME - p = d = s and s or os.getcwd() - while d: - if os.path.isdir(os.path.join(p, 'Testing')): - zope_home = os.path.dirname(os.path.dirname(p)) - sys.path[:1] = [p0, p, zope_home] - break - p, d = s and ('','') or os.path.split(p) - else: - print 'Unable to locate Testing package.', - print 'You might need to set SOFTWARE_HOME.' - sys.exit(1) - -import Testing, unittest -execfile(os.path.join(os.path.dirname(Testing.__file__), 'common.py')) - -# Include ZopeTestCase support -# -if 1: # Create a new scope - - p = os.path.join(os.path.dirname(Testing.__file__), 'ZopeTestCase') - - if not os.path.isdir(p): - print 'Unable to locate ZopeTestCase package.', - print 'You might need to install ZopeTestCase.' - sys.exit(1) - - ztc_common = 'ztc_common.py' - ztc_common_global = os.path.join(p, ztc_common) - - f = 0 - if os.path.exists(ztc_common_global): - execfile(ztc_common_global) - f = 1 - if os.path.exists(ztc_common): - execfile(ztc_common) - f = 1 - - if not f: - print 'Unable to locate %s.' % ztc_common - sys.exit(1) - -# Debug -# -print 'SOFTWARE_HOME: %s' % os.environ.get('SOFTWARE_HOME', 'Not set') -print 'INSTANCE_HOME: %s' % os.environ.get('INSTANCE_HOME', 'Not set') -sys.stdout.flush() - Modified: Zope/trunk/lib/python/Products/Five/formlib/tests/test_formlib.py =================================================================== --- Zope/trunk/lib/python/Products/Five/formlib/tests/test_formlib.py 2008-08-27 12:36:47 UTC (rev 90440) +++ Zope/trunk/lib/python/Products/Five/formlib/tests/test_formlib.py 2008-08-27 12:45:41 UTC (rev 90441) @@ -15,9 +15,6 @@ $Id$ """ -import os, sys -if __name__ == '__main__': - execfile(os.path.join(sys.path[0], 'framework.py')) def test_suite(): import unittest @@ -26,6 +23,3 @@ FunctionalDocFileSuite( 'formlib.txt', package='Products.Five.formlib.tests'), )) - -if __name__ == '__main__': - framework() Deleted: Zope/trunk/lib/python/Products/Five/skin/tests/framework.py =================================================================== --- Zope/trunk/lib/python/Products/Five/skin/tests/framework.py 2008-08-27 12:36:47 UTC (rev 90440) +++ Zope/trunk/lib/python/Products/Five/skin/tests/framework.py 2008-08-27 12:45:41 UTC (rev 90441) @@ -1,107 +0,0 @@ -############################################################################## -# -# ZopeTestCase -# -# COPY THIS FILE TO YOUR 'tests' DIRECTORY. -# -# This version of framework.py will use the SOFTWARE_HOME -# environment variable to locate Zope and the Testing package. -# -# If the tests are run in an INSTANCE_HOME installation of Zope, -# Products.__path__ and sys.path with be adjusted to include the -# instance's Products and lib/python directories respectively. -# -# If you explicitly set INSTANCE_HOME prior to running the tests, -# auto-detection is disabled and the specified path will be used -# instead. -# -# If the 'tests' directory contains a custom_zodb.py file, INSTANCE_HOME -# will be adjusted to use it. -# -# If you set the ZEO_INSTANCE_HOME environment variable a ZEO setup -# is assumed, and you can attach to a running ZEO server (via the -# instance's custom_zodb.py). -# -############################################################################## -# -# The following code should be at the top of every test module: -# -# import os, sys -# if __name__ == '__main__': -# execfile(os.path.join(sys.path[0], 'framework.py')) -# -# ...and the following at the bottom: -# -# if __name__ == '__main__': -# framework() -# -############################################################################## - -__version__ = '0.2.3' - -# Save start state -# -__SOFTWARE_HOME = os.environ.get('SOFTWARE_HOME', '') -__INSTANCE_HOME = os.environ.get('INSTANCE_HOME', '') - -if __SOFTWARE_HOME.endswith(os.sep): - __SOFTWARE_HOME = os.path.dirname(__SOFTWARE_HOME) - -if __INSTANCE_HOME.endswith(os.sep): - __INSTANCE_HOME = os.path.dirname(__INSTANCE_HOME) - -# Find and import the Testing package -# -if not sys.modules.has_key('Testing'): - p0 = sys.path[0] - if p0 and __name__ == '__main__': - os.chdir(p0) - p0 = '' - s = __SOFTWARE_HOME - p = d = s and s or os.getcwd() - while d: - if os.path.isdir(os.path.join(p, 'Testing')): - zope_home = os.path.dirname(os.path.dirname(p)) - sys.path[:1] = [p0, p, zope_home] - break - p, d = s and ('','') or os.path.split(p) - else: - print 'Unable to locate Testing package.', - print 'You might need to set SOFTWARE_HOME.' - sys.exit(1) - -import Testing, unittest -execfile(os.path.join(os.path.dirname(Testing.__file__), 'common.py')) - -# Include ZopeTestCase support -# -if 1: # Create a new scope - - p = os.path.join(os.path.dirname(Testing.__file__), 'ZopeTestCase') - - if not os.path.isdir(p): - print 'Unable to locate ZopeTestCase package.', - print 'You might need to install ZopeTestCase.' - sys.exit(1) - - ztc_common = 'ztc_common.py' - ztc_common_global = os.path.join(p, ztc_common) - - f = 0 - if os.path.exists(ztc_common_global): - execfile(ztc_common_global) - f = 1 - if os.path.exists(ztc_common): - execfile(ztc_common) - f = 1 - - if not f: - print 'Unable to locate %s.' % ztc_common - sys.exit(1) - -# Debug -# -print 'SOFTWARE_HOME: %s' % os.environ.get('SOFTWARE_HOME', 'Not set') -print 'INSTANCE_HOME: %s' % os.environ.get('INSTANCE_HOME', 'Not set') -sys.stdout.flush() - Modified: Zope/trunk/lib/python/Products/Five/skin/tests/test_standardmacros.py =================================================================== --- Zope/trunk/lib/python/Products/Five/skin/tests/test_standardmacros.py 2008-08-27 12:36:47 UTC (rev 90440) +++ Zope/trunk/lib/python/Products/Five/skin/tests/test_standardmacros.py 2008-08-27 12:45:41 UTC (rev 90441) @@ -15,9 +15,6 @@ $Id$ """ -import os, sys -if __name__ == '__main__': - execfile(os.path.join(sys.path[0], 'framework.py')) def test_standard_macros(): """Test standard macros @@ -79,6 +76,3 @@ def test_suite(): from Testing.ZopeTestCase import ZopeDocTestSuite return ZopeDocTestSuite() - -if __name__ == '__main__': - framework() Modified: Zope/trunk/lib/python/Products/Five/tests/boilerplate.py =================================================================== --- Zope/trunk/lib/python/Products/Five/tests/boilerplate.py 2008-08-27 12:36:47 UTC (rev 90440) +++ Zope/trunk/lib/python/Products/Five/tests/boilerplate.py 2008-08-27 12:45:41 UTC (rev 90441) @@ -15,9 +15,6 @@ $Id$ """ -import os, sys -if __name__ == '__main__': - execfile(os.path.join(sys.path[0], 'framework.py')) def test_boilerplate(): """ @@ -38,6 +35,3 @@ def test_suite(): from Testing.ZopeTestCase import ZopeDocTestSuite return ZopeDocTestSuite() - -if __name__ == '__main__': - framework() Deleted: Zope/trunk/lib/python/Products/Five/tests/framework.py =================================================================== --- Zope/trunk/lib/python/Products/Five/tests/framework.py 2008-08-27 12:36:47 UTC (rev 90440) +++ Zope/trunk/lib/python/Products/Five/tests/framework.py 2008-08-27 12:45:41 UTC (rev 90441) @@ -1,107 +0,0 @@ -############################################################################## -# -# ZopeTestCase -# -# COPY THIS FILE TO YOUR 'tests' DIRECTORY. -# -# This version of framework.py will use the SOFTWARE_HOME -# environment variable to locate Zope and the Testing package. -# -# If the tests are run in an INSTANCE_HOME installation of Zope, -# Products.__path__ and sys.path with be adjusted to include the -# instance's Products and lib/python directories respectively. -# -# If you explicitly set INSTANCE_HOME prior to running the tests, -# auto-detection is disabled and the specified path will be used -# instead. -# -# If the 'tests' directory contains a custom_zodb.py file, INSTANCE_HOME -# will be adjusted to use it. -# -# If you set the ZEO_INSTANCE_HOME environment variable a ZEO setup -# is assumed, and you can attach to a running ZEO server (via the -# instance's custom_zodb.py). -# -############################################################################## -# -# The following code should be at the top of every test module: -# -# import os, sys -# if __name__ == '__main__': -# execfile(os.path.join(sys.path[0], 'framework.py')) -# -# ...and the following at the bottom: -# -# if __name__ == '__main__': -# framework() -# -############################################################################## - -__version__ = '0.2.3' - -# Save start state -# -__SOFTWARE_HOME = os.environ.get('SOFTWARE_HOME', '') -__INSTANCE_HOME = os.environ.get('INSTANCE_HOME', '') - -if __SOFTWARE_HOME.endswith(os.sep): - __SOFTWARE_HOME = os.path.dirname(__SOFTWARE_HOME) - -if __INSTANCE_HOME.endswith(os.sep): - __INSTANCE_HOME = os.path.dirname(__INSTANCE_HOME) - -# Find and import the Testing package -# -if not sys.modules.has_key('Testing'): - p0 = sys.path[0] - if p0 and __name__ == '__main__': - os.chdir(p0) - p0 = '' - s = __SOFTWARE_HOME - p = d = s and s or os.getcwd() - while d: - if os.path.isdir(os.path.join(p, 'Testing')): - zope_home = os.path.dirname(os.path.dirname(p)) - sys.path[:1] = [p0, p, zope_home] - break - p, d = s and ('','') or os.path.split(p) - else: - print 'Unable to locate Testing package.', - print 'You might need to set SOFTWARE_HOME.' - sys.exit(1) - -import Testing, unittest -execfile(os.path.join(os.path.dirname(Testing.__file__), 'common.py')) - -# Include ZopeTestCase support -# -if 1: # Create a new scope - - p = os.path.join(os.path.dirname(Testing.__file__), 'ZopeTestCase') - - if not os.path.isdir(p): - print 'Unable to locate ZopeTestCase package.', - print 'You might need to install ZopeTestCase.' - sys.exit(1) - - ztc_common = 'ztc_common.py' - ztc_common_global = os.path.join(p, ztc_common) - - f = 0 - if os.path.exists(ztc_common_global): - execfile(ztc_common_global) - f = 1 - if os.path.exists(ztc_common): - execfile(ztc_common) - f = 1 - - if not f: - print 'Unable to locate %s.' % ztc_common - sys.exit(1) - -# Debug -# -print 'SOFTWARE_HOME: %s' % os.environ.get('SOFTWARE_HOME', 'Not set') -print 'INSTANCE_HOME: %s' % os.environ.get('INSTANCE_HOME', 'Not set') -sys.stdout.flush() - Modified: Zope/trunk/lib/python/Products/Five/tests/test_directives.py =================================================================== --- Zope/trunk/lib/python/Products/Five/tests/test_directives.py 2008-08-27 12:36:47 UTC (rev 90440) +++ Zope/trunk/lib/python/Products/Five/tests/test_directives.py 2008-08-27 12:45:41 UTC (rev 90441) @@ -15,9 +15,6 @@ $Id$ """ -import os, sys -if __name__ == '__main__': - execfile(os.path.join(sys.path[0], 'framework.py')) def test_directives(): """ @@ -77,6 +74,3 @@ def test_suite(): from Testing.ZopeTestCase import ZopeDocTestSuite return ZopeDocTestSuite() - -if __name__ == '__main__': - framework() Modified: Zope/trunk/lib/python/Products/Five/tests/test_event.py =================================================================== --- Zope/trunk/lib/python/Products/Five/tests/test_event.py 2008-08-27 12:36:47 UTC (rev 90440) +++ Zope/trunk/lib/python/Products/Five/tests/test_event.py 2008-08-27 12:45:41 UTC (rev 90441) @@ -15,11 +15,7 @@ $Id$ """ -import os, sys -if __name__ == '__main__': - execfile(os.path.join(sys.path[0], 'framework.py')) - # These classes aren't defined in the doctest because otherwise # they wouldn't be picklable, and we need that to test copy/paste. @@ -90,6 +86,3 @@ from zope.testing.doctest import DocFileSuite return DocFileSuite('event.txt', package="Products.Five.tests", setUp=setUp, tearDown=testing.tearDown) - -if __name__ == '__main__': - framework() Modified: Zope/trunk/lib/python/Products/Five/tests/test_i18n.py =================================================================== --- Zope/trunk/lib/python/Products/Five/tests/test_i18n.py 2008-08-27 12:36:47 UTC (rev 90440) +++ Zope/trunk/lib/python/Products/Five/tests/test_i18n.py 2008-08-27 12:45:41 UTC (rev 90441) @@ -15,9 +15,6 @@ $Id$ """ -import os, sys -if __name__ == '__main__': - execfile(os.path.join(sys.path[0], 'framework.py')) from zope.component.testing import setUp, tearDown @@ -91,6 +88,3 @@ def test_suite(): from zope.testing.doctest import DocTestSuite return DocTestSuite(setUp=setUp, tearDown=tearDown) - -if __name__ == '__main__': - framework() Modified: Zope/trunk/lib/python/Products/Five/tests/test_registerclass.py =================================================================== --- Zope/trunk/lib/python/Products/Five/tests/test_registerclass.py 2008-08-27 12:36:47 UTC (rev 90440) +++ Zope/trunk/lib/python/Products/Five/tests/test_registerclass.py 2008-08-27 12:45:41 UTC (rev 90441) @@ -15,9 +15,6 @@ $Id$ """ -import os, sys -if __name__ == '__main__': - execfile(os.path.join(sys.path[0], 'framework.py')) def test_registerClass(): """ @@ -146,6 +143,3 @@ def test_suite(): from Testing.ZopeTestCase import ZopeDocTestSuite return ZopeDocTestSuite() - -if __name__ == '__main__': - framework() Modified: Zope/trunk/lib/python/Products/Five/tests/test_registerpackage.py =================================================================== --- Zope/trunk/lib/python/Products/Five/tests/test_registerpackage.py 2008-08-27 12:36:47 UTC (rev 90440) +++ Zope/trunk/lib/python/Products/Five/tests/test_registerpackage.py 2008-08-27 12:45:41 UTC (rev 90441) @@ -15,9 +15,7 @@ $Id$ """ -import os, sys -if __name__ == '__main__': - execfile(os.path.join(sys.path[0], 'framework.py')) +import sys # need to add the testing package to the pythonpath in order to # test python-packages-as-products @@ -86,6 +84,3 @@ # Must use functional because registerPackage commits from Testing.ZopeTestCase import FunctionalDocTestSuite return FunctionalDocTestSuite() - -if __name__ == '__main__': - framework() Modified: Zope/trunk/lib/python/Products/Five/tests/test_security.py =================================================================== --- Zope/trunk/lib/python/Products/Five/tests/test_security.py 2008-08-27 12:36:47 UTC (rev 90440) +++ Zope/trunk/lib/python/Products/Five/tests/test_security.py 2008-08-27 12:45:41 UTC (rev 90441) @@ -15,9 +15,6 @@ $Id$ """ -import os, sys -if __name__ == '__main__': - execfile(os.path.join(sys.path[0], 'framework.py')) from zope.interface import Interface, implements from AccessControl import ClassSecurityInfo @@ -318,6 +315,3 @@ def test_suite(): from Testing.ZopeTestCase import ZopeDocTestSuite return ZopeDocTestSuite() - -if __name__ == '__main__': - framework() Modified: Zope/trunk/lib/python/Products/Five/tests/test_size.py =================================================================== --- Zope/trunk/lib/python/Products/Five/tests/test_size.py 2008-08-27 12:36:47 UTC (rev 90440) +++ Zope/trunk/lib/python/Products/Five/tests/test_size.py 2008-08-27 12:45:41 UTC (rev 90441) @@ -15,9 +15,6 @@ $Id$ """ -import os, sys -if __name__ == '__main__': - execfile(os.path.join(sys.path[0], 'framework.py')) from zope.interface import implements from zope.size.interfaces import ISized @@ -102,6 +99,3 @@ def test_suite(): from Testing.ZopeTestCase import ZopeDocTestSuite return ZopeDocTestSuite() - -if __name__ == '__main__': - framework() Deleted: Zope/trunk/lib/python/Products/Five/utilities/browser/tests/framework.py =================================================================== --- Zope/trunk/lib/python/Products/Five/utilities/browser/tests/framework.py 2008-08-27 12:36:47 UTC (rev 90440) +++ Zope/trunk/lib/python/Products/Five/utilities/browser/tests/framework.py 2008-08-27 12:45:41 UTC (rev 90441) @@ -1,107 +0,0 @@ -############################################################################## -# -# ZopeTestCase -# -# COPY THIS FILE TO YOUR 'tests' DIRECTORY. -# -# This version of framework.py will use the SOFTWARE_HOME -# environment variable to locate Zope and the Testing package. -# -# If the tests are run in an INSTANCE_HOME installation of Zope, -# Products.__path__ and sys.path with be adjusted to include the -# instance's Products and lib/python directories respectively. -# -# If you explicitly set INSTANCE_HOME prior to running the tests, -# auto-detection is disabled and the specified path will be used -# instead. -# -# If the 'tests' directory contains a custom_zodb.py file, INSTANCE_HOME -# will be adjusted to use it. -# -# If you set the ZEO_INSTANCE_HOME environment variable a ZEO setup -# is assumed, and you can attach to a running ZEO server (via the -# instance's custom_zodb.py). -# -############################################################################## -# -# The following code should be at the top of every test module: -# -# import os, sys -# if __name__ == '__main__': -# execfile(os.path.join(sys.path[0], 'framework.py')) -# -# ...and the following at the bottom: -# -# if __name__ == '__main__': -# framework() -# -############################################################################## - -__version__ = '0.2.3' - -# Save start state -# -__SOFTWARE_HOME = os.environ.get('SOFTWARE_HOME', '') -__INSTANCE_HOME = os.environ.get('INSTANCE_HOME', '') - -if __SOFTWARE_HOME.endswith(os.sep): - __SOFTWARE_HOME = os.path.dirname(__SOFTWARE_HOME) - -if __INSTANCE_HOME.endswith(os.sep): - __INSTANCE_HOME = os.path.dirname(__INSTANCE_HOME) - -# Find and import the Testing package -# -if not sys.modules.has_key('Testing'): - p0 = sys.path[0] - if p0 and __name__ == '__main__': - os.chdir(p0) - p0 = '' - s = __SOFTWARE_HOME - p = d = s and s or os.getcwd() - while d: - if os.path.isdir(os.path.join(p, 'Testing')): - zope_home = os.path.dirname(os.path.dirname(p)) - sys.path[:1] = [p0, p, zope_home] - break - p, d = s and ('','') or os.path.split(p) - else: - print 'Unable to locate Testing package.', - print 'You might need to set SOFTWARE_HOME.' - sys.exit(1) - -import Testing, unittest -execfile(os.path.join(os.path.dirname(Testing.__file__), 'common.py')) - -# Include ZopeTestCase support -# -if 1: # Create a new scope - - p = os.path.join(os.path.dirname(Testing.__file__), 'ZopeTestCase') - - if not os.path.isdir(p): - print 'Unable to locate ZopeTestCase package.', - print 'You might need to install ZopeTestCase.' - sys.exit(1) - - ztc_common = 'ztc_common.py' - ztc_common_global = os.path.join(p, ztc_common) - - f = 0 - if os.path.exists(ztc_common_global): - execfile(ztc_common_global) - f = 1 - if os.path.exists(ztc_common): - execfile(ztc_common) - f = 1 - - if not f: - print 'Unable to locate %s.' % ztc_common - sys.exit(1) - -# Debug -# -print 'SOFTWARE_HOME: %s' % os.environ.get('SOFTWARE_HOME', 'Not set') -print 'INSTANCE_HOME: %s' % os.environ.get('INSTANCE_HOME', 'Not set') -sys.stdout.flush() - Modified: Zope/trunk/lib/python/Products/Five/utilities/browser/tests/test_marker.py =================================================================== --- Zope/trunk/lib/python/Products/Five/utilities/browser/tests/test_marker.py 2008-08-27 12:36:47 UTC (rev 90440) +++ Zope/trunk/lib/python/Products/Five/utilities/browser/tests/test_marker.py 2008-08-27 12:45:41 UTC (rev 90441) @@ -15,9 +15,6 @@ $Id$ """ -import os, sys -if __name__ == '__main__': - execfile(os.path.join(sys.path[0], 'framework.py')) def test_editview(): """ @@ -91,6 +88,3 @@ def test_suite(): from Testing.ZopeTestCase import ZopeDocTestSuite return ZopeDocTestSuite() - -if __name__ == '__main__': - framework() Modified: Zope/trunk/lib/python/Products/Five/zcml.py =================================================================== --- Zope/trunk/lib/python/Products/Five/zcml.py 2008-08-27 12:36:47 UTC (rev 90440) +++ Zope/trunk/lib/python/Products/Five/zcml.py 2008-08-27 12:45:41 UTC (rev 90441) @@ -15,7 +15,6 @@ $Id$ """ -import warnings import os from zope.configuration import xmlconfig @@ -34,20 +33,12 @@ # load instance site configuration file site_zcml = os.path.join(INSTANCE_HOME, "etc", "site.zcml") skel_site_zcml = os.path.join(INSTANCE_HOME, "skel", "etc", "site.zcml") - skel_site2_zcml = os.path.join(ZOPE_HOME, "skel", "etc", "site.zcml") if os.path.exists(site_zcml): file = site_zcml - elif os.path.exists(skel_site_zcml): + else: # check for zope installation home skel during running unit tests file = skel_site_zcml - else: - file = skel_site2_zcml - msg = "site.zcml should now live at '%s', for " \ - "sites upgraded from Zope 2.9 please copy '%s' " \ - "to '%s'" \ - % (site_zcml, skel_site2_zcml, site_zcml) - warnings.warn(msg, DeprecationWarning) global _context _context = xmlconfig.file(file) Modified: Zope/trunk/lib/python/Products/OFSP/help/Control-Panel_Contents.stx =================================================================== --- Zope/trunk/lib/python/Products/OFSP/help/Control-Panel_Contents.stx 2008-08-27 12:36:47 UTC (rev 90440) +++ Zope/trunk/lib/python/Products/OFSP/help/Control-Panel_Contents.stx 2008-08-27 12:45:41 UTC (rev 90441) @@ -15,8 +15,6 @@ 'System Platform' -- The type of machine Zope is running on. - 'SOFTWARE_HOME' -- The filesystem path of the core Zope software. - 'INSTANCE_HOME' -- The filesystem path where Zope loads add-on software. _______________________________________________ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins