Log message for revision 76337: Use standard doctest.DocFileSuite, no need for ZopeTestCase...
Changed: D Zope/trunk/lib/python/Interface/tests/framework.py U Zope/trunk/lib/python/Interface/tests/test_bridge.py -=- Deleted: Zope/trunk/lib/python/Interface/tests/framework.py =================================================================== --- Zope/trunk/lib/python/Interface/tests/framework.py 2007-06-04 21:41:17 UTC (rev 76336) +++ Zope/trunk/lib/python/Interface/tests/framework.py 2007-06-04 21:45:18 UTC (rev 76337) @@ -1,116 +0,0 @@ -############################################################################## -# -# Copyright (c) 2005 Zope Corporation and Contributors. All Rights Reserved. -# -# This software is subject to the provisions of the Zope Public License, -# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution. -# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED -# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS -# FOR A PARTICULAR PURPOSE. -# -############################################################################## -"""ZopeTestCase framework - -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() - -$Id$ -""" - -__version__ = '0.2.4' - -# 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/Interface/tests/test_bridge.py =================================================================== --- Zope/trunk/lib/python/Interface/tests/test_bridge.py 2007-06-04 21:41:17 UTC (rev 76336) +++ Zope/trunk/lib/python/Interface/tests/test_bridge.py 2007-06-04 21:45:18 UTC (rev 76337) @@ -14,14 +14,13 @@ $Id$ """ +import unittest +from zope.testing.doctest import DocFileSuite -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('bridge.txt', package="Interface.tests") + return unittest.TestSuite([ + DocFileSuite('bridge.txt', package='Interface.tests'), + ]) if __name__ == '__main__': - framework() + unittest.main(defaultTest='test_suite') _______________________________________________ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins