[Zope-CVS] CVS: ZODB - test.py:1.7

[Fred L. Drake, Jr.]

Update of /cvs-repository/ZODB
In directory cvs.zope.org:/tmp/cvs-serv19747

Modified Files:
	test.py 
Log Message:
remove some of the cruftier aspects of logging configuration; these
aren't needed any more


=== ZODB/test.py 1.6 => 1.7 ===
--- ZODB/test.py:1.6	Fri Apr  9 19:07:46 2004
+++ ZODB/test.py	Tue Apr 13 10:58:46 2004
@@ -605,19 +605,12 @@
 
     # Skip this; zLOG will eventually win, and coordinating
     # initialization is a loosing battle.
-    #configure_logging()
+    configure_logging()
 
     # Initialize the path and cwd
     global pathinit
     pathinit = PathInit(build, build_inplace, libdir)
 
-    # We need to make sure zLOG takes its turn at initializing the
-    # logging package before we start calling any logging methods, so
-    # we don't find that it changes at some arbitrary time in the
-    # future.
-    import zLOG
-    zLOG.initialize()
-
     files = find_tests(module_filter)
     files.sort()
 
@@ -660,21 +653,6 @@
     if os.environ.has_key("LOGGING"):
         level = int(os.environ["LOGGING"])
         logging.getLogger().setLevel(level)
-
-    if os.path.exists(logini):
-        # Hack: The ZEO tests need to pass the logging config to
-        # spawned processes.  We haven't thought of a better way to do
-        # it than using environment variables.
-        os.environ["LOGINI"] = logini
-
-    # Re-write the filenames in the environment so they don't wander
-    # when specified as relative paths and we os.chdir().
-    if os.environ.has_key("STUPID_LOG_FILE"):
-        os.environ["STUPID_LOG_FILE"] = os.path.abspath(
-            os.environ["STUPID_LOG_FILE"])
-    if os.environ.has_key("EVENT_LOG_FILE"):
-        os.environ["EVENT_LOG_FILE"] = os.path.abspath(
-            os.environ["EVENT_LOG_FILE"])
 
 
 def process_args(argv=None):