Fix 'check_manifest()' import; Enable logging.

git-svn-id: http://svn.roundup-tracker.org/svnroot/roundup/roundup/trunk@4170 57a73879-2fb5-44c3-a270-3262357dd7e2

diff --git a/run_tests.py b/run_tests.py
index d84f5901b12c62b25b44d3486f19c76be9246bf5..ab3b126ecae8092eadb6a1103feccf8c75b49e8e 100644 (file)
--- a/run_tests.py
+++ b/run_tests.py
@@ -625,28 +625,27 @@ def main(module_filter, test_filter, libdir):
     # Hmm...
     logini = os.path.abspath("log.ini")
 
-    from setup import check_manifest
+    from roundup.dist.command.build import check_manifest
     check_manifest()
 
     # Initialize the path and cwd
     global pathinit
     pathinit = PathInit(build, build_inplace, libdir)
 
-# No logging module in py 2.1
-#    # Initialize the logging module.
+    # Initialize the logging module.
 
-#    import logging.config
-#    logging.basicConfig()
+    import logging.config
+    logging.basicConfig()
 
-#    level = os.getenv("LOGGING")
-#    if level:
-#        level = int(level)
-#    else:
-#        level = logging.CRITICAL
-#    logging.root.setLevel(level)
+    level = os.getenv("LOGGING")
+    if level:
+        level = int(level)
+    else:
+        level = logging.CRITICAL
+    logging.root.setLevel(level)
 
-#    if os.path.exists(logini):
-#        logging.config.fileConfig(logini)
+    if os.path.exists(logini):
+        logging.config.fileConfig(logini)
 
     files = find_tests(module_filter)
     files.sort()