X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=run_tests.py;h=5855e8a0c5a7324f24a4fb066630ac134f091e68;hb=c28424f9add2dfbcb11b5288c4d5f8e6d99e1d8b;hp=401c74a8e61808ccf01c213868a241d5013dc642;hpb=6d9d6ff01f8d6fda5b332dde93f34dc58d6c3101;p=roundup.git diff --git a/run_tests.py b/run_tests.py index 401c74a..5855e8a 100644 --- a/run_tests.py +++ b/run_tests.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python2.2 +#! /usr/bin/env python ############################################################################## # # Copyright (c) 2001, 2002 Zope Corporation and Contributors. @@ -184,6 +184,8 @@ class ImmediateTestResult(unittest._TextTestResult): self._progressWithNames = 0 self._count = count self._testtimes = {} + # docstrings for tests don't override test-descriptions: + self.descriptions = False if progress and verbosity == 1: self.dots = 0 self._progressWithNames = 1 @@ -358,7 +360,6 @@ class PathInit: # Hack sys.path self.cwd = os.getcwd() sys.path.insert(0, os.path.join(self.cwd, self.libdir)) - print sys.path # Hack again for external products. global functional kind = functional and "functional" or "unit" @@ -447,7 +448,8 @@ def walk_with_symlinks(top, func, arg): cycles in your Zope sandbox, so don't do that. """ try: - names = os.listdir(top) + # Prevent 'hidden' files (those starting with '.') from being considered. + names = [f for f in os.listdir(top) if not f.startswith('.')] except os.error: return func(arg, top, names) @@ -578,7 +580,7 @@ class TrackRefs: def runner(files, test_filter, debug): runner = ImmediateTestRunner(verbosity=VERBOSE, debug=debug, - progress=progress) + progress=progress) suite = unittest.TestSuite() for file in files: s = get_suite(file) @@ -627,21 +629,20 @@ def main(module_filter, test_filter, libdir): 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() @@ -694,7 +695,7 @@ def process_args(argv=None): module_filter = None test_filter = None - VERBOSE = 1 + VERBOSE = 2 LOOP = 0 GUI = 0 TRACE = 0