[z3-checkins] r10887 - z3/Five/branch/philikon-restructuring/tests

[philikon at codespeak.net]

Author: philikon
Date: Tue Apr 19 23:56:40 2005
New Revision: 10887

Modified:
   z3/Five/branch/philikon-restructuring/tests/framework.py
Log:
sync with latest version from ZTC repository


Modified: z3/Five/branch/philikon-restructuring/tests/framework.py
==============================================================================
--- z3/Five/branch/philikon-restructuring/tests/framework.py	(original)
+++ z3/Five/branch/philikon-restructuring/tests/framework.py	Tue Apr 19 23:56:40 2005
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# ZopeTestCase
+# ZopeTestCase 
 #
 # COPY THIS FILE TO YOUR 'tests' DIRECTORY.
 #
@@ -12,14 +12,14 @@
 # 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
+# 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
+# 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).
 #
 ##############################################################################
@@ -70,10 +70,6 @@
         print 'You might need to set SOFTWARE_HOME.'
         sys.exit(1)
 
-# zope.conf must be read before 'import Testing'
-import zopeconf
-zopeconf.process()
-
 import Testing, unittest
 execfile(os.path.join(os.path.dirname(Testing.__file__), 'common.py'))
 
@@ -108,3 +104,4 @@
 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()
+