[Checkins] SVN: zope.testrunner/trunk/ Most tests run. Need an updated testrunner recipe.
Lennart Regebro
regebro at gmail.com
Mon Apr 19 04:57:50 EDT 2010
Log message for revision 111063:
Most tests run. Need an updated testrunner recipe.
Changed:
U zope.testrunner/trunk/buildout.cfg
U zope.testrunner/trunk/src/zope/testrunner/__init__.py
U zope.testrunner/trunk/src/zope/testrunner/_doctest.py
U zope.testrunner/trunk/src/zope/testrunner/coverage.py
U zope.testrunner/trunk/src/zope/testrunner/debug.py
U zope.testrunner/trunk/src/zope/testrunner/eggsupport.py
U zope.testrunner/trunk/src/zope/testrunner/feature.py
U zope.testrunner/trunk/src/zope/testrunner/filter.py
U zope.testrunner/trunk/src/zope/testrunner/find.py
U zope.testrunner/trunk/src/zope/testrunner/garbagecollection.py
U zope.testrunner/trunk/src/zope/testrunner/listing.py
U zope.testrunner/trunk/src/zope/testrunner/logsupport.py
U zope.testrunner/trunk/src/zope/testrunner/options.py
U zope.testrunner/trunk/src/zope/testrunner/process.py
U zope.testrunner/trunk/src/zope/testrunner/profiling.py
U zope.testrunner/trunk/src/zope/testrunner/runner.py
U zope.testrunner/trunk/src/zope/testrunner/selftest.py
U zope.testrunner/trunk/src/zope/testrunner/shuffle.py
U zope.testrunner/trunk/src/zope/testrunner/statistics.py
U zope.testrunner/trunk/src/zope/testrunner/tb_format.py
U zope.testrunner/trunk/src/zope/testrunner/testrunner-arguments.txt
U zope.testrunner/trunk/src/zope/testrunner/testrunner-colors.txt
U zope.testrunner/trunk/src/zope/testrunner/testrunner-coverage-win32.txt
U zope.testrunner/trunk/src/zope/testrunner/testrunner-coverage.txt
U zope.testrunner/trunk/src/zope/testrunner/testrunner-debugging-layer-setup.test
U zope.testrunner/trunk/src/zope/testrunner/testrunner-debugging.txt
U zope.testrunner/trunk/src/zope/testrunner/testrunner-discovery.txt
U zope.testrunner/trunk/src/zope/testrunner/testrunner-edge-cases.txt
U zope.testrunner/trunk/src/zope/testrunner/testrunner-errors.txt
U zope.testrunner/trunk/src/zope/testrunner/testrunner-gc.txt
U zope.testrunner/trunk/src/zope/testrunner/testrunner-knit.txt
U zope.testrunner/trunk/src/zope/testrunner/testrunner-layers-api.txt
U zope.testrunner/trunk/src/zope/testrunner/testrunner-layers-buff.txt
U zope.testrunner/trunk/src/zope/testrunner/testrunner-layers-ntd.txt
U zope.testrunner/trunk/src/zope/testrunner/testrunner-layers.txt
U zope.testrunner/trunk/src/zope/testrunner/testrunner-leaks-err.txt
U zope.testrunner/trunk/src/zope/testrunner/testrunner-leaks.txt
U zope.testrunner/trunk/src/zope/testrunner/testrunner-profiling-cprofiler.txt
U zope.testrunner/trunk/src/zope/testrunner/testrunner-profiling.txt
U zope.testrunner/trunk/src/zope/testrunner/testrunner-progress.txt
U zope.testrunner/trunk/src/zope/testrunner/testrunner-repeat.txt
U zope.testrunner/trunk/src/zope/testrunner/testrunner-shuffle.txt
U zope.testrunner/trunk/src/zope/testrunner/testrunner-simple.txt
U zope.testrunner/trunk/src/zope/testrunner/testrunner-subunit-err.txt
U zope.testrunner/trunk/src/zope/testrunner/testrunner-subunit-leaks.txt
U zope.testrunner/trunk/src/zope/testrunner/testrunner-subunit.txt
U zope.testrunner/trunk/src/zope/testrunner/testrunner-test-selection.txt
U zope.testrunner/trunk/src/zope/testrunner/testrunner-verbose.txt
U zope.testrunner/trunk/src/zope/testrunner/testrunner-wo-source.txt
U zope.testrunner/trunk/src/zope/testrunner/tests.py
-=-
Modified: zope.testrunner/trunk/buildout.cfg
===================================================================
--- zope.testrunner/trunk/buildout.cfg 2010-04-19 08:11:17 UTC (rev 111062)
+++ zope.testrunner/trunk/buildout.cfg 2010-04-19 08:57:49 UTC (rev 111063)
@@ -4,7 +4,7 @@
[test]
recipe = zc.recipe.testrunner
-eggs = zope.testing
+eggs = zope.testrunner
# The [test2X] sections below are to make testing with various Python versions
@@ -21,14 +21,14 @@
[test24]
python = python2.4
recipe = zc.recipe.testrunner
-eggs = zope.testing
+eggs = zope.testrunner
[test25]
python = python2.5
recipe = zc.recipe.testrunner
-eggs = zope.testing
+eggs = zope.testrunner
[test26]
python = python2.6
recipe = zc.recipe.testrunner
-eggs = zope.testing
+eggs = zope.testrunner
Modified: zope.testrunner/trunk/src/zope/testrunner/__init__.py
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/__init__.py 2010-04-19 08:11:17 UTC (rev 111062)
+++ zope.testrunner/trunk/src/zope/testrunner/__init__.py 2010-04-19 08:57:49 UTC (rev 111063)
@@ -20,7 +20,7 @@
import unittest
-import zope.testing.testrunner.interfaces
+import zope.testrunner.interfaces
def run(defaults=None, args=None, script_parts=None):
@@ -40,7 +40,7 @@
"""
# XXX Bah. Lazy import to avoid circular/early import problems
- from zope.testing.testrunner.runner import Runner
+ from zope.testrunner.runner import Runner
runner = Runner(defaults, args, script_parts=script_parts)
runner.run()
return runner.failed
@@ -60,5 +60,5 @@
if __name__ == '__main__':
# allow people to try out the test runner with
- # python -m zope.testing.testrunner --test-path .
+ # python -m zope.testrunner --test-path .
run()
Modified: zope.testrunner/trunk/src/zope/testrunner/_doctest.py
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/_doctest.py 2010-04-19 08:11:17 UTC (rev 111062)
+++ zope.testrunner/trunk/src/zope/testrunner/_doctest.py 2010-04-19 08:57:49 UTC (rev 111063)
@@ -18,10 +18,10 @@
import sys
import doctest
-import zope.testing.testrunner.feature
+import zope.testrunner.feature
-class DocTest(zope.testing.testrunner.feature.Feature):
+class DocTest(zope.testrunner.feature.Feature):
active = True
Modified: zope.testrunner/trunk/src/zope/testrunner/coverage.py
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/coverage.py 2010-04-19 08:11:17 UTC (rev 111062)
+++ zope.testrunner/trunk/src/zope/testrunner/coverage.py 2010-04-19 08:57:49 UTC (rev 111063)
@@ -21,8 +21,8 @@
import os.path
import threading
-import zope.testing.testrunner.feature
-from zope.testing.testrunner.find import test_dirs
+import zope.testrunner.feature
+from zope.testrunner.find import test_dirs
# For some reason, the doctest module resets the trace callable randomly, thus
@@ -123,7 +123,7 @@
return os.path.normcase(os.path.abspath(filename))
-class Coverage(zope.testing.testrunner.feature.Feature):
+class Coverage(zope.testrunner.feature.Feature):
tracer = None
directory = None
Modified: zope.testrunner/trunk/src/zope/testrunner/debug.py
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/debug.py 2010-04-19 08:11:17 UTC (rev 111062)
+++ zope.testrunner/trunk/src/zope/testrunner/debug.py 2010-04-19 08:57:49 UTC (rev 111063)
@@ -21,7 +21,7 @@
import sys
import pdb
-import zope.testing.testrunner.interfaces
+import zope.testrunner.interfaces
def post_mortem(exc_info):
@@ -49,7 +49,7 @@
print "%s:" % (exc_info[0], )
print exc_info[1]
pdb.post_mortem(exc_info[2])
- raise zope.testing.testrunner.interfaces.EndRun()
+ raise zope.testrunner.interfaces.EndRun()
def print_doctest_location(err):
Modified: zope.testrunner/trunk/src/zope/testrunner/eggsupport.py
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/eggsupport.py 2010-04-19 08:11:17 UTC (rev 111062)
+++ zope.testrunner/trunk/src/zope/testrunner/eggsupport.py 2010-04-19 08:57:49 UTC (rev 111063)
@@ -41,7 +41,7 @@
tests_require=['zope.testing >= 3.6.1dev', #XXX fix version at release
],
...
- test_loader='zope.testing.testrunner.eggsupport:SkipLayers',
+ test_loader='zope.testrunner.eggsupport:SkipLayers',
...
)
"""
@@ -79,7 +79,7 @@
...
entry_points='''
[setuptools.commands]
- ftest = zope.testing.testrunner.eggsupport:SetuptoolsFunctionalTest
+ ftest = zope.testrunner.eggsupport:SetuptoolsFunctionalTest
'''
...
)
@@ -95,7 +95,7 @@
pass # suppress normal handling
def run(self):
- from zope.testing.testrunner import run
+ from zope.testrunner import run
dist = self.distribution
where = dist.package_dir or '.'
Modified: zope.testrunner/trunk/src/zope/testrunner/feature.py
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/feature.py 2010-04-19 08:11:17 UTC (rev 111062)
+++ zope.testrunner/trunk/src/zope/testrunner/feature.py 2010-04-19 08:57:49 UTC (rev 111063)
@@ -17,13 +17,13 @@
"""
import zope.interface
-import zope.testing.testrunner.interfaces
+import zope.testrunner.interfaces
class Feature(object):
"""A base class implementing no-op methods for the IFeature interface."""
- zope.interface.implements(zope.testing.testrunner.interfaces.IFeature)
+ zope.interface.implements(zope.testrunner.interfaces.IFeature)
active = False
Modified: zope.testrunner/trunk/src/zope/testrunner/filter.py
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/filter.py 2010-04-19 08:11:17 UTC (rev 111062)
+++ zope.testrunner/trunk/src/zope/testrunner/filter.py 2010-04-19 08:57:49 UTC (rev 111063)
@@ -16,13 +16,13 @@
$Id: __init__.py 86218 2008-05-03 14:17:26Z ctheune $
"""
-import zope.testing.testrunner.feature
+import zope.testrunner.feature
-UNITTEST_LAYER = 'zope.testing.testrunner.layer.UnitTests'
+UNITTEST_LAYER = 'zope.testrunner.layer.UnitTests'
-class Filter(zope.testing.testrunner.feature.Feature):
+class Filter(zope.testrunner.feature.Feature):
"""Filters and orders all tests registered until now."""
active = True
Modified: zope.testrunner/trunk/src/zope/testrunner/find.py
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/find.py 2010-04-19 08:11:17 UTC (rev 111062)
+++ zope.testrunner/trunk/src/zope/testrunner/find.py 2010-04-19 08:57:49 UTC (rev 111063)
@@ -21,9 +21,9 @@
import unittest
import sys
-import zope.testing.testrunner.feature
-import zope.testing.testrunner.layer
-import zope.testing.testrunner.debug
+import zope.testrunner.feature
+import zope.testrunner.layer
+import zope.testrunner.debug
identifier = re.compile(r'[_a-zA-Z]\w*$').match
@@ -61,7 +61,7 @@
To simulate the user pressing 'c' and hitting return in the
debugger, we use a FakeInputContinueGenerator:
- >>> from zope.testing.testrunner.runner import FakeInputContinueGenerator
+ >>> from zope.testrunner.runner import FakeInputContinueGenerator
>>> old_stdin = sys.stdin
>>> sys.stdin = FakeInputContinueGenerator()
@@ -94,7 +94,7 @@
if item is None:
raise TypeError('If post_mortem is specified, '
'full exc_info must be passed!')
- zope.testing.testrunner.debug.post_mortem(exc_info)
+ zope.testrunner.debug.post_mortem(exc_info)
self.module = module
self.exc_info = exc_info
@@ -337,7 +337,7 @@
def tests_from_suite(suite, options, dlevel=1,
- dlayer=zope.testing.testrunner.layer.UnitTests):
+ dlayer=zope.testrunner.layer.UnitTests):
"""Returns a sequence of (test, layer_name)
The tree of suites is recursively visited, with the most specific
@@ -404,7 +404,7 @@
return name
-class Find(zope.testing.testrunner.feature.Feature):
+class Find(zope.testrunner.feature.Feature):
"""Finds tests and registers them with the test runner."""
active = True
Modified: zope.testrunner/trunk/src/zope/testrunner/garbagecollection.py
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/garbagecollection.py 2010-04-19 08:11:17 UTC (rev 111062)
+++ zope.testrunner/trunk/src/zope/testrunner/garbagecollection.py 2010-04-19 08:57:49 UTC (rev 111063)
@@ -18,10 +18,10 @@
import gc
import sys
-import zope.testing.testrunner.feature
+import zope.testrunner.feature
-class Threshold(zope.testing.testrunner.feature.Feature):
+class Threshold(zope.testrunner.feature.Feature):
def __init__(self, runner):
super(Threshold, self).__init__(runner)
@@ -52,7 +52,7 @@
gc.set_threshold(*self.old_threshold)
-class Debug(zope.testing.testrunner.feature.Feature):
+class Debug(zope.testrunner.feature.Feature):
"""Manages garbage collection debug flags."""
def __init__(self, runner):
Modified: zope.testrunner/trunk/src/zope/testrunner/listing.py
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/listing.py 2010-04-19 08:11:17 UTC (rev 111062)
+++ zope.testrunner/trunk/src/zope/testrunner/listing.py 2010-04-19 08:57:49 UTC (rev 111063)
@@ -16,10 +16,10 @@
$Id: __init__.py 86218 2008-05-03 14:17:26Z ctheune $
"""
-import zope.testing.testrunner.feature
+import zope.testrunner.feature
-class Listing(zope.testing.testrunner.feature.Feature):
+class Listing(zope.testrunner.feature.Feature):
"""Lists all tests in the report instead of running the tests."""
def __init__(self, runner):
Modified: zope.testrunner/trunk/src/zope/testrunner/logsupport.py
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/logsupport.py 2010-04-19 08:11:17 UTC (rev 111062)
+++ zope.testrunner/trunk/src/zope/testrunner/logsupport.py 2010-04-19 08:57:49 UTC (rev 111063)
@@ -25,10 +25,10 @@
import logging.config
import os.path
-import zope.testing.testrunner.feature
+import zope.testrunner.feature
-class Logging(zope.testing.testrunner.feature.Feature):
+class Logging(zope.testrunner.feature.Feature):
active = True
Modified: zope.testrunner/trunk/src/zope/testrunner/options.py
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/options.py 2010-04-19 08:11:17 UTC (rev 111062)
+++ zope.testrunner/trunk/src/zope/testrunner/options.py 2010-04-19 08:57:49 UTC (rev 111063)
@@ -23,13 +23,13 @@
import pkg_resources
-from zope.testing.testrunner.profiling import available_profilers
-from zope.testing.testrunner.formatter import (
+from zope.testrunner.profiling import available_profilers
+from zope.testrunner.formatter import (
OutputFormatter,
ColorfulOutputFormatter,
SubunitOutputFormatter,
)
-from zope.testing.testrunner.formatter import terminal_has_colors
+from zope.testrunner.formatter import terminal_has_colors
parser = optparse.OptionParser("Usage: %prog [options] [MODULE] [TEST]")
@@ -111,7 +111,7 @@
extension of Python regexp notation, a leading "!" is stripped and
causes the sense of the remaining regexp to be negated (so "!bc"
matches any string that does not match "bc", and vice versa). The
-layer named 'zope.testing.testrunner.layer.UnitTests' is reserved for
+layer named 'zope.testrunner.layer.UnitTests' is reserved for
unit tests, however, take note of the --unit and non-unit options.
""")
@@ -632,7 +632,7 @@
if options.unit:
# XXX Argh.
- options.layer = ['zope.testing.testrunner.layer.UnitTests']
+ options.layer = ['zope.testrunner.layer.UnitTests']
if options.layer:
options.layer = map(compile_filter, options.layer)
Modified: zope.testrunner/trunk/src/zope/testrunner/process.py
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/process.py 2010-04-19 08:11:17 UTC (rev 111062)
+++ zope.testrunner/trunk/src/zope/testrunner/process.py 2010-04-19 08:57:49 UTC (rev 111063)
@@ -17,10 +17,10 @@
"""
import sys
-import zope.testing.testrunner.feature
+import zope.testrunner.feature
-class SubProcess(zope.testing.testrunner.feature.Feature):
+class SubProcess(zope.testrunner.feature.Feature):
"""Lists all tests in the report instead of running the tests."""
def __init__(self, runner):
Modified: zope.testrunner/trunk/src/zope/testrunner/profiling.py
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/profiling.py 2010-04-19 08:11:17 UTC (rev 111062)
+++ zope.testrunner/trunk/src/zope/testrunner/profiling.py 2010-04-19 08:57:49 UTC (rev 111063)
@@ -20,7 +20,7 @@
import glob
import sys
import tempfile
-import zope.testing.testrunner.feature
+import zope.testrunner.feature
available_profilers = {}
@@ -89,7 +89,7 @@
available_profilers['hotshot'] = HotshotProfiler
-class Profiling(zope.testing.testrunner.feature.Feature):
+class Profiling(zope.testrunner.feature.Feature):
def __init__(self, runner):
super(Profiling, self).__init__(runner)
Modified: zope.testrunner/trunk/src/zope/testrunner/runner.py
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/runner.py 2010-04-19 08:11:17 UTC (rev 111062)
+++ zope.testrunner/trunk/src/zope/testrunner/runner.py 2010-04-19 08:57:49 UTC (rev 111063)
@@ -29,24 +29,24 @@
import traceback
import unittest
-from zope.testing.testrunner.find import import_name
-from zope.testing.testrunner.find import name_from_layer, _layer_name_cache
-from zope.testing.testrunner.refcount import TrackRefs
-from zope.testing.testrunner.options import get_options
-import zope.testing.testrunner.coverage
-import zope.testing.testrunner._doctest
-import zope.testing.testrunner.logsupport
-import zope.testing.testrunner.selftest
-import zope.testing.testrunner.profiling
-import zope.testing.testrunner.filter
-import zope.testing.testrunner.garbagecollection
-import zope.testing.testrunner.listing
-import zope.testing.testrunner.statistics
-import zope.testing.testrunner.process
-import zope.testing.testrunner.interfaces
-import zope.testing.testrunner.debug
-import zope.testing.testrunner.tb_format
-import zope.testing.testrunner.shuffle
+from zope.testrunner.find import import_name
+from zope.testrunner.find import name_from_layer, _layer_name_cache
+from zope.testrunner.refcount import TrackRefs
+from zope.testrunner.options import get_options
+import zope.testrunner.coverage
+import zope.testrunner._doctest
+import zope.testrunner.logsupport
+import zope.testrunner.selftest
+import zope.testrunner.profiling
+import zope.testrunner.filter
+import zope.testrunner.garbagecollection
+import zope.testrunner.listing
+import zope.testrunner.statistics
+import zope.testrunner.process
+import zope.testrunner.interfaces
+import zope.testrunner.debug
+import zope.testrunner.tb_format
+import zope.testrunner.shuffle
PYREFCOUNT_PATTERN = re.compile('\[[0-9]+ refs\]')
@@ -174,28 +174,28 @@
self.options = options
- self.features.append(zope.testing.testrunner.selftest.SelfTest(self))
- self.features.append(zope.testing.testrunner.logsupport.Logging(self))
- self.features.append(zope.testing.testrunner.coverage.Coverage(self))
- self.features.append(zope.testing.testrunner._doctest.DocTest(self))
- self.features.append(zope.testing.testrunner.profiling.Profiling(self))
+ self.features.append(zope.testrunner.selftest.SelfTest(self))
+ self.features.append(zope.testrunner.logsupport.Logging(self))
+ self.features.append(zope.testrunner.coverage.Coverage(self))
+ self.features.append(zope.testrunner._doctest.DocTest(self))
+ self.features.append(zope.testrunner.profiling.Profiling(self))
if is_jython:
# Jython GC support is not yet implemented
pass
else:
self.features.append(
- zope.testing.testrunner.garbagecollection.Threshold(self))
+ zope.testrunner.garbagecollection.Threshold(self))
self.features.append(
- zope.testing.testrunner.garbagecollection.Debug(self))
+ zope.testrunner.garbagecollection.Debug(self))
- self.features.append(zope.testing.testrunner.find.Find(self))
- self.features.append(zope.testing.testrunner.shuffle.Shuffle(self))
- self.features.append(zope.testing.testrunner.process.SubProcess(self))
- self.features.append(zope.testing.testrunner.filter.Filter(self))
- self.features.append(zope.testing.testrunner.listing.Listing(self))
+ self.features.append(zope.testrunner.find.Find(self))
+ self.features.append(zope.testrunner.shuffle.Shuffle(self))
+ self.features.append(zope.testrunner.process.SubProcess(self))
+ self.features.append(zope.testrunner.filter.Filter(self))
+ self.features.append(zope.testrunner.listing.Listing(self))
self.features.append(
- zope.testing.testrunner.statistics.Statistics(self))
- self.features.append(zope.testing.testrunner.tb_format.Traceback(self))
+ zope.testrunner.statistics.Statistics(self))
+ self.features.append(zope.testrunner.tb_format.Traceback(self))
# Remove all features that aren't activated
self.features = [f for f in self.features if f.active]
@@ -217,7 +217,7 @@
try:
self.ran += run_layer(self.options, layer_name, layer, tests,
setup_layers, self.failures, self.errors)
- except zope.testing.testrunner.interfaces.EndRun:
+ except zope.testrunner.interfaces.EndRun:
self.failed = True
return
except CanNotTearDown:
@@ -365,7 +365,7 @@
try:
setup_layer(options, layer, setup_layers)
- except zope.testing.testrunner.interfaces.EndRun:
+ except zope.testrunner.interfaces.EndRun:
raise
except Exception:
f = cStringIO.StringIO()
@@ -638,7 +638,7 @@
% options.resume_layer)
raise
else:
- zope.testing.testrunner.debug.post_mortem(
+ zope.testrunner.debug.post_mortem(
sys.exc_info())
else:
raise
@@ -710,7 +710,7 @@
" when running a layer"
" as a subprocess!")
else:
- zope.testing.testrunner.debug.post_mortem(exc_info)
+ zope.testrunner.debug.post_mortem(exc_info)
elif self.options.stop_on_error:
self.stop()
@@ -723,7 +723,7 @@
if self.options.post_mortem:
# XXX: mgedmin: why isn't there a resume_layer check here like
# in addError?
- zope.testing.testrunner.debug.post_mortem(exc_info)
+ zope.testrunner.debug.post_mortem(exc_info)
elif self.options.stop_on_error:
self.stop()
Modified: zope.testrunner/trunk/src/zope/testrunner/selftest.py
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/selftest.py 2010-04-19 08:11:17 UTC (rev 111062)
+++ zope.testrunner/trunk/src/zope/testrunner/selftest.py 2010-04-19 08:57:49 UTC (rev 111063)
@@ -19,12 +19,12 @@
"""
import pdb
-import zope.testing.testrunner.feature
+import zope.testrunner.feature
real_pdb_set_trace = pdb.set_trace
-class SelfTest(zope.testing.testrunner.feature.Feature):
+class SelfTest(zope.testrunner.feature.Feature):
active = True
Modified: zope.testrunner/trunk/src/zope/testrunner/shuffle.py
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/shuffle.py 2010-04-19 08:11:17 UTC (rev 111062)
+++ zope.testrunner/trunk/src/zope/testrunner/shuffle.py 2010-04-19 08:57:49 UTC (rev 111063)
@@ -19,10 +19,10 @@
import time
import random
import unittest
-import zope.testing.testrunner.feature
+import zope.testrunner.feature
-class Shuffle(zope.testing.testrunner.feature.Feature):
+class Shuffle(zope.testrunner.feature.Feature):
"""Take the tests found so far and shuffle them."""
def __init__(self, runner):
Modified: zope.testrunner/trunk/src/zope/testrunner/statistics.py
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/statistics.py 2010-04-19 08:11:17 UTC (rev 111062)
+++ zope.testrunner/trunk/src/zope/testrunner/statistics.py 2010-04-19 08:57:49 UTC (rev 111063)
@@ -17,10 +17,10 @@
"""
import time
-import zope.testing.testrunner.feature
+import zope.testrunner.feature
-class Statistics(zope.testing.testrunner.feature.Feature):
+class Statistics(zope.testrunner.feature.Feature):
active = True
layers_run = 0
Modified: zope.testrunner/trunk/src/zope/testrunner/tb_format.py
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/tb_format.py 2010-04-19 08:11:17 UTC (rev 111062)
+++ zope.testrunner/trunk/src/zope/testrunner/tb_format.py 2010-04-19 08:57:49 UTC (rev 111063)
@@ -19,7 +19,7 @@
import sys
import traceback
import zope.exceptions.exceptionformatter
-import zope.testing.testrunner.feature
+import zope.testrunner.feature
def format_exception(t, v, tb, limit=None):
@@ -34,7 +34,7 @@
file.writelines(format_exception(t, v, tb, limit))
-class Traceback(zope.testing.testrunner.feature.Feature):
+class Traceback(zope.testrunner.feature.Feature):
active = True
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-arguments.txt
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-arguments.txt 2010-04-19 08:11:17 UTC (rev 111062)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-arguments.txt 2010-04-19 08:57:49 UTC (rev 111063)
@@ -11,7 +11,7 @@
... '--path', directory_with_tests,
... '--tests-pattern', '^sampletestsf?$',
... ]
- >>> from zope.testing import testrunner
+ >>> from zope import testrunner
>>> testrunner.run_internal(defaults, 'test --layer 111'.split())
Running samplelayers.Layer111 tests:
Set up samplelayers.Layerx in N.NNN seconds.
@@ -37,7 +37,7 @@
... '--path', directory_with_tests,
... '--tests-pattern', '^sampletestsf?$',
... ]
- >>> from zope.testing import testrunner
+ >>> from zope import testrunner
>>> testrunner.run_internal(defaults, 'test --layer 111'.split())
Listing samplelayers.Layer111 tests:
test_x1 (sample1.sampletests.test111.TestA)
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-colors.txt
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-colors.txt 2010-04-19 08:11:17 UTC (rev 111062)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-colors.txt 2010-04-19 08:57:49 UTC (rev 111063)
@@ -12,7 +12,7 @@
... '--tests-pattern', '^sampletestsf?$',
... ]
- >>> from zope.testing import testrunner
+ >>> from zope import testrunner
Since it wouldn't be a good idea to have terminal control characters in a
test file, let's wrap sys.stdout in a simple terminal interpreter
@@ -99,11 +99,11 @@
Tear down samplelayers.Layer121 in {green}0.000{normal} seconds.
Set up samplelayers.Layer122 in {green}0.000{normal} seconds.
{normal} Ran {green}34{normal} tests with {green}0{normal} failures and {green}0{normal} errors in {green}0.008{normal} seconds.{normal}
- {normal}Running zope.testing.testrunner.layer.UnitTests tests:{normal}
+ {normal}Running zope.testrunner.layer.UnitTests tests:{normal}
Tear down samplelayers.Layer122 in {green}0.000{normal} seconds.
Tear down samplelayers.Layer12 in {green}0.000{normal} seconds.
Tear down samplelayers.Layer1 in {green}0.000{normal} seconds.
- Set up zope.testing.testrunner.layer.UnitTests in {green}N.NNN{normal} seconds.
+ Set up zope.testrunner.layer.UnitTests in {green}N.NNN{normal} seconds.
<BLANKLINE>
<BLANKLINE>
{boldred}Failure in test eek (sample2.sampletests_e){normal}
@@ -176,7 +176,7 @@
<BLANKLINE>
{normal} Ran {green}200{normal} tests with {boldred}3{normal} failures and {boldred}1{normal} errors in {green}0.045{normal} seconds.{normal}
{normal}Tearing down left over layers:{normal}
- Tear down zope.testing.testrunner.layer.UnitTests in {green}N.NNN{normal} seconds.
+ Tear down zope.testrunner.layer.UnitTests in {green}N.NNN{normal} seconds.
{normal}Total: {green}413{normal} tests, {boldred}3{normal} failures, {boldred}1{normal} errors in {green}0.023{normal} seconds.{normal}
True
@@ -189,8 +189,8 @@
>>> sys.argv = 'test --tests-pattern ^pledge$ -c'.split()
>>> _ = testrunner.run_internal(defaults)
- {normal}Running zope.testing.testrunner.layer.UnitTests tests:{normal}
- Set up zope.testing.testrunner.layer.UnitTests in {green}N.NNN{normal} seconds.
+ {normal}Running zope.testrunner.layer.UnitTests tests:{normal}
+ Set up zope.testrunner.layer.UnitTests in {green}N.NNN{normal} seconds.
<BLANKLINE>
<BLANKLINE>
{boldred}Failure in test pledge (pledge){normal}
@@ -214,15 +214,15 @@
<BLANKLINE>
{normal} Ran {green}1{normal} tests with {boldred}1{normal} failures and {green}0{normal} errors in {green}0.002{normal} seconds.{normal}
{normal}Tearing down left over layers:{normal}
- Tear down zope.testing.testrunner.layer.UnitTests in {green}N.NNN{normal} seconds.
+ Tear down zope.testrunner.layer.UnitTests in {green}N.NNN{normal} seconds.
Diffs are highlighted so you can easily tell the context and the mismatches
apart:
>>> sys.argv = 'test --tests-pattern ^pledge$ --ndiff -c'.split()
>>> _ = testrunner.run_internal(defaults)
- {normal}Running zope.testing.testrunner.layer.UnitTests tests:{normal}
- Set up zope.testing.testrunner.layer.UnitTests in {green}N.NNN{normal} seconds.
+ {normal}Running zope.testrunner.layer.UnitTests tests:{normal}
+ Set up zope.testrunner.layer.UnitTests in {green}N.NNN{normal} seconds.
<BLANKLINE>
<BLANKLINE>
{boldred}Failure in test pledge (pledge){normal}
@@ -243,13 +243,13 @@
<BLANKLINE>
{normal} Ran {green}1{normal} tests with {boldred}1{normal} failures and {green}0{normal} errors in {green}0.003{normal} seconds.{normal}
{normal}Tearing down left over layers:{normal}
- Tear down zope.testing.testrunner.layer.UnitTests in {green}N.NNN{normal} seconds.
+ Tear down zope.testrunner.layer.UnitTests in {green}N.NNN{normal} seconds.
Even test failures that have actual blank lines (as opposed to <BLANKLINE>) in
them are highlighted correctly.
- >>> import zope.testing.testrunner.formatter
- >>> formatter = zope.testing.testrunner.formatter.ColorfulOutputFormatter(None)
+ >>> import zope.testrunner.formatter
+ >>> formatter = zope.testrunner.formatter.ColorfulOutputFormatter(None)
>>> formatter.print_doctest_failure("""\
... File "sometest.txt", line 221, in sometest.txt
... Failed example:
@@ -284,8 +284,8 @@
>>> sys.argv = 'test -u -t test_one.TestNotMuch -c -vvv'.split()
>>> testrunner.run_internal(defaults)
{normal}Running tests at level 1{normal}
- {normal}Running zope.testing.testrunner.layer.UnitTests tests:{normal}
- Set up zope.testing.testrunner.layer.UnitTests in {green}N.NNN{normal} seconds.
+ {normal}Running zope.testrunner.layer.UnitTests tests:{normal}
+ Set up zope.testrunner.layer.UnitTests in {green}N.NNN{normal} seconds.
{normal} Running:{normal}
test_1 (sample1.sampletests.test_one.TestNotMuch) ({green}N.NNN s{normal})
test_2 (sample1.sampletests.test_one.TestNotMuch) ({green}N.NNN s{normal})
@@ -295,7 +295,7 @@
test_3 (sampletests.test_one.TestNotMuch) ({green}N.NNN s{normal})
{normal} Ran {green}6{normal} tests with {green}0{normal} failures and {green}0{normal} errors in {green}N.NNN{normal} seconds.{normal}
{normal}Tearing down left over layers:{normal}
- Tear down zope.testing.testrunner.layer.UnitTests in {green}N.NNN{normal} seconds.
+ Tear down zope.testrunner.layer.UnitTests in {green}N.NNN{normal} seconds.
False
@@ -306,8 +306,8 @@
>>> sys.argv = 'test -u -t test_one.TestNotMuch -c -vvv --slow-test 0'.split()
>>> testrunner.run_internal(defaults)
{normal}Running tests at level 1{normal}
- {normal}Running zope.testing.testrunner.layer.UnitTests tests:{normal}
- Set up zope.testing.testrunner.layer.UnitTests in {green}N.NNN{normal} seconds.
+ {normal}Running zope.testrunner.layer.UnitTests tests:{normal}
+ Set up zope.testrunner.layer.UnitTests in {green}N.NNN{normal} seconds.
{normal} Running:{normal}
test_1 (sample1.sampletests.test_one.TestNotMuch) ({boldmagenta}N.NNN s{normal})
test_2 (sample1.sampletests.test_one.TestNotMuch) ({boldmagenta}N.NNN s{normal})
@@ -317,7 +317,7 @@
test_3 (sampletests.test_one.TestNotMuch) ({boldmagenta}N.NNN s{normal})
{normal} Ran {green}6{normal} tests with {green}0{normal} failures and {green}0{normal} errors in {green}N.NNN{normal} seconds.{normal}
{normal}Tearing down left over layers:{normal}
- Tear down zope.testing.testrunner.layer.UnitTests in {green}N.NNN{normal} seconds.
+ Tear down zope.testrunner.layer.UnitTests in {green}N.NNN{normal} seconds.
False
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-coverage-win32.txt
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-coverage-win32.txt 2010-04-19 08:11:17 UTC (rev 111062)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-coverage-win32.txt 2010-04-19 08:57:49 UTC (rev 111063)
@@ -5,7 +5,7 @@
randomly passed to TestIgnore.names.
Watch out for the case of the R drive!
- >>> from zope.testing.testrunner.coverage import TestIgnore
+ >>> from zope.testrunner.coverage import TestIgnore
>>> ignore = TestIgnore((('r:\\winproject\\src\\blah\\foo', ''),
... ('R:\\winproject\\src\\blah\\bar', '')))
>>> ignore._test_dirs
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-coverage.txt
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-coverage.txt 2010-04-19 08:11:17 UTC (rev 111062)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-coverage.txt 2010-04-19 08:57:49 UTC (rev 111063)
@@ -14,7 +14,7 @@
>>> sys.argv = 'test --coverage=coverage_dir'.split()
- >>> from zope.testing import testrunner
+ >>> from zope import testrunner
>>> testrunner.run_internal(defaults)
Running samplelayers.Layer1 tests:
Set up samplelayers.Layer1 in 0.000 seconds.
@@ -43,14 +43,14 @@
Tear down samplelayers.Layer121 in 0.000 seconds.
Set up samplelayers.Layer122 in 0.000 seconds.
Ran 34 tests with 0 failures and 0 errors in 0.125 seconds.
- Running zope.testing.testrunner.layer.UnitTests tests:
+ Running zope.testrunner.layer.UnitTests tests:
Tear down samplelayers.Layer122 in 0.000 seconds.
Tear down samplelayers.Layer12 in 0.000 seconds.
Tear down samplelayers.Layer1 in 0.000 seconds.
- Set up zope.testing.testrunner.layer.UnitTests in 0.000 seconds.
+ Set up zope.testrunner.layer.UnitTests in 0.000 seconds.
Ran 192 tests with 0 failures and 0 errors in 0.687 seconds.
Tearing down left over layers:
- Tear down zope.testing.testrunner.layer.UnitTests in 0.000 seconds.
+ Tear down zope.testrunner.layer.UnitTests in 0.000 seconds.
lines cov% module (path)
...
48 100% sampletests.test1 (testrunner-ex/sampletests/test1.py)
@@ -94,8 +94,8 @@
... package = None
... test_path = [('/myproject/src/blah/foo', ''),
... ('/myproject/src/blah/bar', '')]
- >>> from zope.testing.testrunner import coverage
- >>> from zope.testing.testrunner.find import test_dirs
+ >>> from zope.testrunner import coverage
+ >>> from zope.testrunner.find import test_dirs
>>> ignore = coverage.TestIgnore(test_dirs(FauxOptions(), {}))
>>> ignore._test_dirs
['/myproject/src/blah/foo/', '/myproject/src/blah/bar/']
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-debugging-layer-setup.test
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-debugging-layer-setup.test 2010-04-19 08:11:17 UTC (rev 111062)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-debugging-layer-setup.test 2010-04-19 08:57:49 UTC (rev 111063)
@@ -41,9 +41,9 @@
... sys.stdin = Input('p x\nc')
>>> sys.argv = [testrunner_script]
- >>> import zope.testing.testrunner
+ >>> import zope.testrunner
>>> try:
- ... zope.testing.testrunner.run_internal(['--path', dir, '-D'])
+ ... zope.testrunner.run_internal(['--path', dir, '-D'])
... finally: sys.stdin = real_stdin
... # doctest: +ELLIPSIS
Running tests.Layer tests:
@@ -98,7 +98,7 @@
>>> import sys
>>> try:
- ... zope.testing.testrunner.run_internal(
+ ... zope.testrunner.run_internal(
... ['--path', dir, '-Dvv', '--tests-pattern', 'tests2'])
... finally: sys.stdin = real_stdin
... # doctest: +ELLIPSIS +REPORT_NDIFF
@@ -126,7 +126,7 @@
<BLANKLINE>
<BLANKLINE>
Tests with errors:
- runTest (zope.testing.testrunner.runner.SetUpLayerFailure)
+ runTest (zope.testrunner.runner.SetUpLayerFailure)
Total: 1 tests, 0 failures, 1 errors in 0.210 seconds.
True
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-debugging.txt
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-debugging.txt 2010-04-19 08:11:17 UTC (rev 111062)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-debugging.txt 2010-04-19 08:57:49 UTC (rev 111063)
@@ -18,7 +18,7 @@
>>> import os.path, sys
>>> directory_with_tests = os.path.join(this_directory, 'testrunner-ex')
- >>> from zope.testing import testrunner
+ >>> from zope import testrunner
>>> defaults = [
... '--path', directory_with_tests,
... '--tests-pattern', '^sampletestsf?$',
@@ -35,7 +35,7 @@
>>> try: testrunner.run_internal(defaults)
... finally: sys.stdin = real_stdin
... # doctest: +ELLIPSIS
- Running zope.testing.testrunner.layer.UnitTests tests:
+ Running zope.testrunner.layer.UnitTests tests:
...
> testrunner-ex/sample3/sampletests_d.py(27)test_set_trace1()
-> y = x
@@ -61,7 +61,7 @@
>>> try: testrunner.run_internal(defaults)
... finally: sys.stdin = real_stdin
... # doctest: +NORMALIZE_WHITESPACE +REPORT_NDIFF
- Running zope.testing.testrunner.layer.UnitTests tests:
+ Running zope.testrunner.layer.UnitTests tests:
...
Error in test test_post_mortem1 (sample3.sampletests_d.TestSomething)
Traceback (most recent call last):
@@ -90,7 +90,7 @@
>>> try: testrunner.run_internal(defaults)
... finally: sys.stdin = real_stdin
... # doctest: +NORMALIZE_WHITESPACE +REPORT_NDIFF
- Running zope.testing.testrunner.layer.UnitTests tests:
+ Running zope.testrunner.layer.UnitTests tests:
...
Error in test test_post_mortem_failure1 (sample3.sampletests_d.TestSomething)
Traceback (most recent call last):
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-discovery.txt
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-discovery.txt 2010-04-19 08:11:17 UTC (rev 111062)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-discovery.txt 2010-04-19 08:57:49 UTC (rev 111063)
@@ -10,7 +10,7 @@
>>> import os, sys
>>> directory_with_tests = os.path.join(this_directory, 'testrunner-ex')
- >>> from zope.testing import testrunner
+ >>> from zope import testrunner
>>> defaults = [
... '--path', directory_with_tests,
@@ -20,11 +20,11 @@
... '--tests-pattern', '^sampletests_discover$',
... ]
>>> testrunner.run(defaults)
- Running zope.testing.testrunner.layer.UnitTests tests:
- Set up zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Running zope.testrunner.layer.UnitTests tests:
+ Set up zope.testrunner.layer.UnitTests in N.NNN seconds.
Ran 1 tests with 0 failures and 0 errors in N.NNN seconds.
Tearing down left over layers:
- Tear down zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Tear down zope.testrunner.layer.UnitTests in N.NNN seconds.
False
If the module neither provides a TestSuite nor has discoverable tests,
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-edge-cases.txt
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-edge-cases.txt 2010-04-19 08:11:17 UTC (rev 111062)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-edge-cases.txt 2010-04-19 08:57:49 UTC (rev 111063)
@@ -15,7 +15,7 @@
>>> import os, sys
>>> directory_with_tests = os.path.join(this_directory, 'testrunner-ex')
- >>> from zope.testing import testrunner
+ >>> from zope import testrunner
>>> defaults = [
... '--test-path', directory_with_tests,
@@ -40,14 +40,14 @@
Set up samplelayers.Layer1 in 0.000 seconds.
Ran 9 tests with 0 failures and 0 errors in 0.000 seconds.
...
- Running zope.testing.testrunner.layer.UnitTests tests:
+ Running zope.testrunner.layer.UnitTests tests:
Tear down samplelayers.Layer122 in N.NNN seconds.
Tear down samplelayers.Layer12 in N.NNN seconds.
Tear down samplelayers.Layer1 in N.NNN seconds.
- Set up zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Set up zope.testrunner.layer.UnitTests in N.NNN seconds.
Ran 192 tests with 0 failures and 0 errors in N.NNN seconds.
Tearing down left over layers:
- Tear down zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Tear down zope.testrunner.layer.UnitTests in N.NNN seconds.
Total: 405 tests, 0 failures, 0 errors in N.NNN seconds.
False
@@ -94,7 +94,7 @@
>>> try: testrunner.run_internal(defaults)
... finally: sys.stdin = real_stdin
... # doctest: +ELLIPSIS
- Running zope.testing.testrunner.layer.UnitTests tests:...
+ Running zope.testrunner.layer.UnitTests tests:...
> testrunner-ex/sample3/sampletests_d.py(47)f()
-> y = x
(Pdb) p x
@@ -111,7 +111,7 @@
... ' -t set_trace4').split()
>>> try: testrunner.run_internal(defaults)
... finally: sys.stdin = real_stdin
- Running zope.testing.testrunner.layer.UnitTests tests:...
+ Running zope.testrunner.layer.UnitTests tests:...
--Return--
> doctest.py(351)set_trace()->None
-> pdb.Pdb.set_trace(self)
@@ -132,7 +132,7 @@
... ' -t set_trace3').split()
>>> try: testrunner.run_internal(defaults)
... finally: sys.stdin = real_stdin
- Running zope.testing.testrunner.layer.UnitTests tests:...
+ Running zope.testrunner.layer.UnitTests tests:...
--Return--
> doctest.py(351)set_trace()->None
-> pdb.Pdb.set_trace(self)
@@ -154,7 +154,7 @@
... ' -t set_trace5').split()
>>> try: testrunner.run_internal(defaults)
... finally: sys.stdin = real_stdin
- Running zope.testing.testrunner.layer.UnitTests tests:...
+ Running zope.testrunner.layer.UnitTests tests:...
--Return--
> doctest.py(351)set_trace()->None
-> pdb.Pdb.set_trace(self)
@@ -177,7 +177,7 @@
... ' -t set_trace6').split()
>>> try: testrunner.run_internal(defaults)
... finally: sys.stdin = real_stdin
- Running zope.testing.testrunner.layer.UnitTests tests:...
+ Running zope.testrunner.layer.UnitTests tests:...
--Return--
> doctest.py(351)set_trace()->None
-> pdb.Pdb.set_trace(self)
@@ -199,7 +199,7 @@
>>> try: testrunner.run_internal(defaults)
... finally: sys.stdin = real_stdin
... # doctest: +NORMALIZE_WHITESPACE
- Running zope.testing.testrunner.layer.UnitTests tests:...
+ Running zope.testrunner.layer.UnitTests tests:...
<BLANKLINE>
<BLANKLINE>
Error in test test_post_mortem2 (sample3.sampletests_d.TestSomething)
@@ -229,8 +229,8 @@
>>> try: testrunner.run_internal(defaults)
... finally: sys.stdin = real_stdin
... # doctest: +NORMALIZE_WHITESPACE
- Running zope.testing.testrunner.layer.UnitTests tests:
- Set up zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Running zope.testrunner.layer.UnitTests tests:
+ Set up zope.testrunner.layer.UnitTests in N.NNN seconds.
<BLANKLINE>
<BLANKLINE>
Error in test post_mortem3 (sample3.sampletests_d)
@@ -263,8 +263,8 @@
>>> try: testrunner.run_internal(defaults)
... finally: sys.stdin = real_stdin
... # doctest: +NORMALIZE_WHITESPACE
- Running zope.testing.testrunner.layer.UnitTests tests:
- Set up zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Running zope.testrunner.layer.UnitTests tests:
+ Set up zope.testrunner.layer.UnitTests in N.NNN seconds.
<BLANKLINE>
<BLANKLINE>
Error in test post_mortem4 (sample3.sampletests_d)
@@ -298,8 +298,8 @@
>>> try: testrunner.run_internal(defaults)
... finally: sys.stdin = real_stdin
... # doctest: +NORMALIZE_WHITESPACE
- Running zope.testing.testrunner.layer.UnitTests tests:
- Set up zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Running zope.testrunner.layer.UnitTests tests:
+ Set up zope.testrunner.layer.UnitTests in N.NNN seconds.
<BLANKLINE>
<BLANKLINE>
Error testrunner-ex/sample3/post_mortem5.txt
@@ -333,8 +333,8 @@
>>> try: testrunner.run_internal(defaults)
... finally: sys.stdin = real_stdin
... # doctest: +NORMALIZE_WHITESPACE
- Running zope.testing.testrunner.layer.UnitTests tests:...
- Set up zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Running zope.testrunner.layer.UnitTests tests:...
+ Set up zope.testrunner.layer.UnitTests in N.NNN seconds.
<BLANKLINE>
<BLANKLINE>
Error testrunner-ex/sample3/post_mortem6.txt
@@ -368,7 +368,7 @@
>>> try: testrunner.run_internal(defaults)
... finally: sys.stdin = real_stdin
... # doctest: +NORMALIZE_WHITESPACE
- Running zope.testing.testrunner.layer.UnitTests tests:...
+ Running zope.testrunner.layer.UnitTests tests:...
<BLANKLINE>
<BLANKLINE>
Error in test post_mortem_failure2 (sample3.sampletests_d)
@@ -403,7 +403,7 @@
>>> try: testrunner.run_internal(defaults)
... finally: sys.stdin = real_stdin
... # doctest: +NORMALIZE_WHITESPACE
- Running zope.testing.testrunner.layer.UnitTests tests:...
+ Running zope.testrunner.layer.UnitTests tests:...
<BLANKLINE>
<BLANKLINE>
Error in test /home/jim/z3/zope.testing/src/zope/testing/testrunner-ex/sample3/post_mortem_failure.txt
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-errors.txt
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-errors.txt 2010-04-19 08:11:17 UTC (rev 111062)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-errors.txt 2010-04-19 08:57:49 UTC (rev 111063)
@@ -17,7 +17,7 @@
... shutil.copy(os.path.join(root, f),
... os.path.join(directory_with_tests, root[n:], f))
- >>> from zope.testing import testrunner
+ >>> from zope import testrunner
>>> defaults = [
... '--path', directory_with_tests,
... '--tests-pattern', '^sampletestsf?$',
@@ -28,7 +28,7 @@
... # doctest: +NORMALIZE_WHITESPACE +ELLIPSIS
Running samplelayers.Layer1 tests:
...
- Running zope.testing.testrunner.layer.UnitTests tests:
+ Running zope.testrunner.layer.UnitTests tests:
...
<BLANKLINE>
<BLANKLINE>
@@ -98,7 +98,7 @@
<BLANKLINE>
Ran 200 tests with 3 failures and 1 errors in N.NNN seconds.
Tearing down left over layers:
- Tear down zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Tear down zope.testrunner.layer.UnitTests in N.NNN seconds.
Total: 413 tests, 3 failures, 1 errors in N.NNN seconds.
True
@@ -113,7 +113,7 @@
>>> testrunner.run_internal(defaults)
... # doctest: +NORMALIZE_WHITESPACE +REPORT_NDIFF
Running tests at level 1
- Running zope.testing.testrunner.layer.UnitTests tests:
+ Running zope.testrunner.layer.UnitTests tests:
...
Running:
.................................................................................................
@@ -204,8 +204,8 @@
... ' -p').split()
>>> testrunner.run_internal(defaults)
... # doctest: +NORMALIZE_WHITESPACE +REPORT_NDIFF
- Running zope.testing.testrunner.layer.UnitTests tests:
- Set up zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Running zope.testrunner.layer.UnitTests tests:
+ Set up zope.testrunner.layer.UnitTests in N.NNN seconds.
Running:
1/56 (1.8%)
<BLANKLINE>
@@ -362,7 +362,7 @@
##r##
Ran 56 tests with 3 failures and 1 errors in 0.054 seconds.
Tearing down left over layers:
- Tear down zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Tear down zope.testrunner.layer.UnitTests in N.NNN seconds.
True
If you also want a summary of errors at the end, ask for verbosity as well
@@ -377,8 +377,8 @@
>>> sys.argv = 'test --tests-pattern ^sampletests_1$'.split()
>>> testrunner.run_internal(defaults) # doctest: +NORMALIZE_WHITESPACE
- Running zope.testing.testrunner.layer.UnitTests tests:
- Set up zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Running zope.testrunner.layer.UnitTests tests:
+ Set up zope.testrunner.layer.UnitTests in N.NNN seconds.
<BLANKLINE>
<BLANKLINE>
Failure in test eek (sample2.sampletests_1)
@@ -424,7 +424,7 @@
<BLANKLINE>
Ran 1 tests with 1 failures and 0 errors in 0.002 seconds.
Tearing down left over layers:
- Tear down zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Tear down zope.testrunner.layer.UnitTests in N.NNN seconds.
True
This can be a bit confusing, especially when there are enough tests
@@ -434,8 +434,8 @@
>>> sys.argv = 'test --tests-pattern ^sampletests_1$ -1'.split()
>>> testrunner.run_internal(defaults) # doctest:
- Running zope.testing.testrunner.layer.UnitTests tests:
- Set up zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Running zope.testrunner.layer.UnitTests tests:
+ Set up zope.testrunner.layer.UnitTests in N.NNN seconds.
<BLANKLINE>
<BLANKLINE>
Failure in test eek (sample2.sampletests_1)
@@ -457,7 +457,7 @@
<BLANKLINE>
Ran 1 tests with 1 failures and 0 errors in 0.001 seconds.
Tearing down left over layers:
- Tear down zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Tear down zope.testrunner.layer.UnitTests in N.NNN seconds.
True
The --hide-secondary-failures option is an alias for -1:
@@ -467,8 +467,8 @@
... ' --hide-secondary-failures'
... ).split()
>>> testrunner.run_internal(defaults) # doctest:
- Running zope.testing.testrunner.layer.UnitTests tests:
- Set up zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Running zope.testrunner.layer.UnitTests tests:
+ Set up zope.testrunner.layer.UnitTests in N.NNN seconds.
<BLANKLINE>
<BLANKLINE>
Failure in test eek (sample2.sampletests_1)
@@ -490,7 +490,7 @@
<BLANKLINE>
Ran 1 tests with 1 failures and 0 errors in 0.001 seconds.
Tearing down left over layers:
- Tear down zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Tear down zope.testrunner.layer.UnitTests in N.NNN seconds.
True
The --show-secondary-failures option counters -1 (or it's alias),
@@ -503,8 +503,8 @@
... ' --hide-secondary-failures --show-secondary-failures'
... ).split()
>>> testrunner.run_internal(defaults) # doctest: +NORMALIZE_WHITESPACE
- Running zope.testing.testrunner.layer.UnitTests tests:
- Set up zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Running zope.testrunner.layer.UnitTests tests:
+ Set up zope.testrunner.layer.UnitTests in N.NNN seconds.
<BLANKLINE>
<BLANKLINE>
Failure in test eek (sample2.sampletests_1)
@@ -550,7 +550,7 @@
<BLANKLINE>
Ran 1 tests with 1 failures and 0 errors in 0.002 seconds.
Tearing down left over layers:
- Tear down zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Tear down zope.testrunner.layer.UnitTests in N.NNN seconds.
True
@@ -564,8 +564,8 @@
>>> sys.argv = 'test --tests-pattern ^pledge$'.split()
>>> _ = testrunner.run_internal(defaults)
- Running zope.testing.testrunner.layer.UnitTests tests:
- Set up zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Running zope.testrunner.layer.UnitTests tests:
+ Set up zope.testrunner.layer.UnitTests in N.NNN seconds.
<BLANKLINE>
<BLANKLINE>
Failure in test pledge (pledge)
@@ -589,7 +589,7 @@
<BLANKLINE>
Ran 1 tests with 1 failures and 0 errors in 0.002 seconds.
Tearing down left over layers:
- Tear down zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Tear down zope.testrunner.layer.UnitTests in N.NNN seconds.
Here, the actual output uses the word "and" rather than the word "an",
but it's a bit hard to pick this out. We can use the various diff
@@ -604,8 +604,8 @@
>>> sys.argv = 'test --tests-pattern ^pledge$ --ndiff'.split()
>>> _ = testrunner.run_internal(defaults)
- Running zope.testing.testrunner.layer.UnitTests tests:
- Set up zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Running zope.testrunner.layer.UnitTests tests:
+ Set up zope.testrunner.layer.UnitTests in N.NNN seconds.
<BLANKLINE>
<BLANKLINE>
Failure in test pledge (pledge)
@@ -626,14 +626,14 @@
<BLANKLINE>
Ran 1 tests with 1 failures and 0 errors in 0.003 seconds.
Tearing down left over layers:
- Tear down zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Tear down zope.testrunner.layer.UnitTests in N.NNN seconds.
The -udiff option requests a standard "unified" diff:
>>> sys.argv = 'test --tests-pattern ^pledge$ --udiff'.split()
>>> _ = testrunner.run_internal(defaults)
- Running zope.testing.testrunner.layer.UnitTests tests:
- Set up zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Running zope.testrunner.layer.UnitTests tests:
+ Set up zope.testrunner.layer.UnitTests in N.NNN seconds.
<BLANKLINE>
<BLANKLINE>
Failure in test pledge (pledge)
@@ -653,14 +653,14 @@
<BLANKLINE>
Ran 1 tests with 1 failures and 0 errors in 0.002 seconds.
Tearing down left over layers:
- Tear down zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Tear down zope.testrunner.layer.UnitTests in N.NNN seconds.
The -cdiff option requests a standard "context" diff:
>>> sys.argv = 'test --tests-pattern ^pledge$ --cdiff'.split()
>>> _ = testrunner.run_internal(defaults)
- Running zope.testing.testrunner.layer.UnitTests tests:
- Set up zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Running zope.testrunner.layer.UnitTests tests:
+ Set up zope.testrunner.layer.UnitTests in N.NNN seconds.
<BLANKLINE>
<BLANKLINE>
Failure in test pledge (pledge)
@@ -684,7 +684,7 @@
<BLANKLINE>
Ran 1 tests with 1 failures and 0 errors in 0.002 seconds.
Tearing down left over layers:
- Tear down zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Tear down zope.testrunner.layer.UnitTests in N.NNN seconds.
Specifying more than one diff option at once causes an error:
@@ -806,8 +806,8 @@
>>> sys.argv = 'test --tests-pattern ^unicode$ -u'.split()
>>> testrunner.run_internal(defaults) # doctest: +REPORT_NDIFF
- Running zope.testing.testrunner.layer.UnitTests tests:
- Set up zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Running zope.testrunner.layer.UnitTests tests:
+ Set up zope.testrunner.layer.UnitTests in N.NNN seconds.
<BLANKLINE>
<BLANKLINE>
Failure testrunner-ex/unicode.txt
@@ -833,7 +833,7 @@
<BLANKLINE>
Ran 3 tests with 1 failures and 0 errors in N.NNN seconds.
Tearing down left over layers:
- Tear down zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Tear down zope.testrunner.layer.UnitTests in N.NNN seconds.
True
@@ -856,12 +856,12 @@
... else:
... print 'sys.exit was not called'
... # doctest: +ELLIPSIS
- Running zope.testing.testrunner.layer.UnitTests tests:
- Set up zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Running zope.testrunner.layer.UnitTests tests:
+ Set up zope.testrunner.layer.UnitTests in N.NNN seconds.
...
Ran 1 tests with 1 failures and 0 errors in 0.002 seconds.
Tearing down left over layers:
- Tear down zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Tear down zope.testrunner.layer.UnitTests in N.NNN seconds.
exited with code 1
Passing tests exit with code 0 according to UNIX practices:
@@ -877,14 +877,14 @@
... # doctest: +ELLIPSIS
Running samplelayers.Layer11 tests:
...
- Running zope.testing.testrunner.layer.UnitTests tests:
+ Running zope.testrunner.layer.UnitTests tests:
Tear down samplelayers.Layer122 in N.NNN seconds.
Tear down samplelayers.Layer12 in N.NNN seconds.
Tear down samplelayers.Layer1 in N.NNN seconds.
- Set up zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Set up zope.testrunner.layer.UnitTests in N.NNN seconds.
Ran 160 tests with 0 failures and 0 errors in N.NNN seconds.
Tearing down left over layers:
- Tear down zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Tear down zope.testrunner.layer.UnitTests in N.NNN seconds.
Total: 364 tests, 0 failures, 0 errors in N.NNN seconds.
exited with code 0
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-gc.txt
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-gc.txt 2010-04-19 08:11:17 UTC (rev 111062)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-gc.txt 2010-04-19 08:57:49 UTC (rev 111063)
@@ -14,19 +14,19 @@
>>> directory_with_tests = os.path.join(this_directory, 'testrunner-ex')
>>> defaults = ['--path', directory_with_tests]
- >>> from zope.testing import testrunner
+ >>> from zope import testrunner
>>> sys.argv = 'test --tests-pattern ^gc0$ --gc 0 -vv'.split()
>>> _ = testrunner.run_internal(defaults)
Cyclic garbage collection is disabled.
Running tests at level 1
- Running zope.testing.testrunner.layer.UnitTests tests:
- Set up zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Running zope.testrunner.layer.UnitTests tests:
+ Set up zope.testrunner.layer.UnitTests in N.NNN seconds.
Running:
make_sure_gc_is_disabled (gc0)
Ran 1 tests with 0 failures and 0 errors in N.NNN seconds.
Tearing down left over layers:
- Tear down zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Tear down zope.testrunner.layer.UnitTests in N.NNN seconds.
Alternatively, if you think you are having a garbage collection
@@ -37,13 +37,13 @@
>>> _ = testrunner.run_internal(defaults)
Cyclic garbage collection threshold set to: (1,)
Running tests at level 1
- Running zope.testing.testrunner.layer.UnitTests tests:
- Set up zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Running zope.testrunner.layer.UnitTests tests:
+ Set up zope.testrunner.layer.UnitTests in N.NNN seconds.
Running:
make_sure_gc_threshold_is_one (gc1)
Ran 1 tests with 0 failures and 0 errors in N.NNN seconds.
Tearing down left over layers:
- Tear down zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Tear down zope.testrunner.layer.UnitTests in N.NNN seconds.
You can specify up to 3 --gc options to set each of the 3 gc threshold
values:
@@ -54,13 +54,13 @@
>>> _ = testrunner.run_internal(defaults)
Cyclic garbage collection threshold set to: (701, 11, 9)
Running tests at level 1
- Running zope.testing.testrunner.layer.UnitTests tests:
- Set up zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Running zope.testrunner.layer.UnitTests tests:
+ Set up zope.testrunner.layer.UnitTests in N.NNN seconds.
Running:
make_sure_gc_threshold_is_701_11_9 (gcset)
Ran 1 tests with 0 failures and 0 errors in N.NNN seconds.
Tearing down left over layers:
- Tear down zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Tear down zope.testrunner.layer.UnitTests in N.NNN seconds.
Specifying more than 3 --gc options is not allowed:
@@ -100,13 +100,13 @@
... .split())
>>> _ = testrunner.run_internal(defaults)
Running tests at level 1
- Running zope.testing.testrunner.layer.UnitTests tests:
- Set up zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Running zope.testrunner.layer.UnitTests tests:
+ Set up zope.testrunner.layer.UnitTests in N.NNN seconds.
Running:
generate_some_gc_statistics (gcstats)
Ran 1 tests with 0 failures and 0 errors in N.NNN seconds.
Tearing down left over layers:
- Tear down zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Tear down zope.testrunner.layer.UnitTests in N.NNN seconds.
>>> sys.stderr = stderr
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-knit.txt
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-knit.txt 2010-04-19 08:11:17 UTC (rev 111062)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-knit.txt 2010-04-19 08:57:49 UTC (rev 111063)
@@ -38,7 +38,7 @@
... 'sample4.products',
... ]
- >>> from zope.testing import testrunner
+ >>> from zope import testrunner
>>> sys.argv = 'test --layer Layer111 -vv'.split()
>>> _ = testrunner.run_internal(defaults)
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-layers-api.txt
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-layers-api.txt 2010-04-19 08:11:17 UTC (rev 111062)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-layers-api.txt 2010-04-19 08:57:49 UTC (rev 111063)
@@ -95,7 +95,7 @@
Before we can run the tests, we need to setup some helpers.
->>> from zope.testing.testrunner import options
+>>> from zope.testrunner import options
>>> from zope.testing.loggingsupport import InstalledHandler
>>> import logging
>>> log_handler = InstalledHandler('zope.testing.tests')
@@ -111,18 +111,18 @@
the TestSpecifyingNoLayer was run and setup/torn down around the
TestSpecifyingBaseLayer tests.
->>> from zope.testing.testrunner.runner import Runner
+>>> from zope.testrunner.runner import Runner
>>> runner = Runner(options=fresh_options(), args=[], found_suites=[umbrella_suite])
>>> succeeded = runner.run()
Running BaseLayer tests:
Set up BaseLayer in N.NNN seconds.
Ran 2 tests with 0 failures and 0 errors in N.NNN seconds.
-Running zope.testing.testrunner.layer.UnitTests tests:
+Running zope.testrunner.layer.UnitTests tests:
Tear down BaseLayer in N.NNN seconds.
- Set up zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Set up zope.testrunner.layer.UnitTests in N.NNN seconds.
Ran 2 tests with 0 failures and 0 errors in N.NNN seconds.
Tearing down left over layers:
- Tear down zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Tear down zope.testrunner.layer.UnitTests in N.NNN seconds.
Total: 4 tests, 0 failures, 0 errors in N.NNN seconds.
@@ -205,7 +205,7 @@
Now lets stack a few more layers to ensure that our setUp and tearDown
methods are called in the correct order.
->>> from zope.testing.testrunner.find import name_from_layer
+>>> from zope.testrunner.find import name_from_layer
>>> class A(object):
... def setUp(cls):
... log('%s.setUp' % name_from_layer(cls))
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-layers-buff.txt
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-layers-buff.txt 2010-04-19 08:11:17 UTC (rev 111062)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-layers-buff.txt 2010-04-19 08:57:49 UTC (rev 111063)
@@ -29,7 +29,7 @@
That second suite has two tests. Both sleep for half a second each.
>>> directory_with_tests = os.path.join(this_directory, 'testrunner-ex')
- >>> from zope.testing import testrunner
+ >>> from zope import testrunner
>>> defaults = [
... '--path', directory_with_tests,
... ]
@@ -179,7 +179,7 @@
... "0 0 0")
>>> directory_with_tests = os.path.join(this_directory, 'testrunner-ex')
- >>> from zope.testing import testrunner
+ >>> from zope import testrunner
>>> defaults = [
... '--path', directory_with_tests,
... ]
@@ -207,7 +207,7 @@
... "")
>>> directory_with_tests = os.path.join(this_directory, 'testrunner-ex')
- >>> from zope.testing import testrunner
+ >>> from zope import testrunner
>>> defaults = [
... '--path', directory_with_tests,
... ]
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-layers-ntd.txt
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-layers-ntd.txt 2010-04-19 08:11:17 UTC (rev 111062)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-layers-ntd.txt 2010-04-19 08:57:49 UTC (rev 111063)
@@ -7,7 +7,7 @@
>>> import os.path, sys
>>> directory_with_tests = os.path.join(this_directory, 'testrunner-ex')
- >>> from zope.testing import testrunner
+ >>> from zope import testrunner
>>> defaults = [
... '--path', directory_with_tests,
... '--tests-pattern', '^sampletestsf?$',
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-layers.txt
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-layers.txt 2010-04-19 08:11:17 UTC (rev 111062)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-layers.txt 2010-04-19 08:57:49 UTC (rev 111063)
@@ -11,7 +11,7 @@
... ]
>>> sys.argv = 'test --layer 112 --layer Unit'.split()
- >>> from zope.testing import testrunner
+ >>> from zope import testrunner
>>> testrunner.run_internal(defaults)
Running samplelayers.Layer112 tests:
Set up samplelayers.Layerx in N.NNN seconds.
@@ -19,15 +19,15 @@
Set up samplelayers.Layer11 in N.NNN seconds.
Set up samplelayers.Layer112 in N.NNN seconds.
Ran 34 tests with 0 failures and 0 errors in N.NNN seconds.
- Running zope.testing.testrunner.layer.UnitTests tests:
+ Running zope.testrunner.layer.UnitTests tests:
Tear down samplelayers.Layer112 in N.NNN seconds.
Tear down samplelayers.Layerx in N.NNN seconds.
Tear down samplelayers.Layer11 in N.NNN seconds.
Tear down samplelayers.Layer1 in N.NNN seconds.
- Set up zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Set up zope.testrunner.layer.UnitTests in N.NNN seconds.
Ran 192 tests with 0 failures and 0 errors in N.NNN seconds.
Tearing down left over layers:
- Tear down zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Tear down zope.testrunner.layer.UnitTests in N.NNN seconds.
Total: 226 tests, 0 failures, 0 errors in N.NNN seconds.
False
@@ -36,11 +36,11 @@
>>> sys.argv = 'test -u'.split()
>>> testrunner.run_internal(defaults)
- Running zope.testing.testrunner.layer.UnitTests tests:
- Set up zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Running zope.testrunner.layer.UnitTests tests:
+ Set up zope.testrunner.layer.UnitTests in N.NNN seconds.
Ran 192 tests with 0 failures and 0 errors in N.NNN seconds.
Tearing down left over layers:
- Tear down zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Tear down zope.testrunner.layer.UnitTests in N.NNN seconds.
False
@@ -113,14 +113,14 @@
Tear down samplelayers.Layer121 in N.NNN seconds.
Set up samplelayers.Layer122 in N.NNN seconds.
Ran 34 tests with 0 failures and 0 errors in N.NNN seconds.
- Running zope.testing.testrunner.layer.UnitTests tests:
+ Running zope.testrunner.layer.UnitTests tests:
Tear down samplelayers.Layer122 in N.NNN seconds.
Tear down samplelayers.Layer12 in N.NNN seconds.
Tear down samplelayers.Layer1 in N.NNN seconds.
- Set up zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Set up zope.testrunner.layer.UnitTests in N.NNN seconds.
Ran 192 tests with 0 failures and 0 errors in N.NNN seconds.
Tearing down left over layers:
- Tear down zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Tear down zope.testrunner.layer.UnitTests in N.NNN seconds.
Total: 405 tests, 0 failures, 0 errors in N.NNN seconds.
False
@@ -167,9 +167,9 @@
Set up samplelayers.Layer12 in N.NNN seconds.
Set up samplelayers.Layer122 in N.NNN seconds.
Ran 34 tests with 0 failures and 0 errors in N.NNN seconds.
- Running zope.testing.testrunner.layer.UnitTests tests:
+ Running zope.testrunner.layer.UnitTests tests:
Running in a subprocess.
- Set up zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Set up zope.testrunner.layer.UnitTests in N.NNN seconds.
Ran 192 tests with 0 failures and 0 errors in N.NNN seconds.
Total: 405 tests, 0 failures, 0 errors in N.NNN seconds.
False
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-leaks-err.txt
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-leaks-err.txt 2010-04-19 08:11:17 UTC (rev 111062)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-leaks-err.txt 2010-04-19 08:57:49 UTC (rev 111063)
@@ -12,7 +12,7 @@
... '--tests-pattern', '^sampletestsf?$',
... ]
- >>> from zope.testing import testrunner
+ >>> from zope import testrunner
>>> sys.argv = 'test -r -N6'.split()
>>> _ = testrunner.run_internal(defaults)
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-leaks.txt
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-leaks.txt 2010-04-19 08:11:17 UTC (rev 111062)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-leaks.txt 2010-04-19 08:57:49 UTC (rev 111063)
@@ -13,7 +13,7 @@
... '--tests-pattern', '^sampletestsf?$',
... ]
- >>> from zope.testing import testrunner
+ >>> from zope import testrunner
>>> sys.argv = 'test --layer Layer11$ --layer Layer12$ -N4 -r'.split()
>>> _ = testrunner.run_internal(defaults)
@@ -61,7 +61,7 @@
>>> sys.argv = 'test --tests-pattern leak -N4 -r'.split()
>>> _ = testrunner.run_internal(defaults)
- Running zope.testing.testrunner.layer.UnitTests tests:...
+ Running zope.testrunner.layer.UnitTests tests:...
Iteration 1
Ran 1 tests with 0 failures and 0 errors in 0.000 seconds.
Iteration 2
@@ -74,7 +74,7 @@
Ran 1 tests with 0 failures and 0 errors in 0.000 seconds.
sys refcount=92520 change=12
Tearing down left over layers:
- Tear down zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Tear down zope.testrunner.layer.UnitTests in N.NNN seconds.
Here we see that the system refcount is increating. If we specify a
verbosity greater than one, we can get details broken out by object
@@ -83,7 +83,7 @@
>>> sys.argv = 'test --tests-pattern leak -N5 -r -v'.split()
>>> _ = testrunner.run_internal(defaults)
Running tests at level 1
- Running zope.testing.testrunner.layer.UnitTests tests:...
+ Running zope.testrunner.layer.UnitTests tests:...
Iteration 1
Running:
.
@@ -163,7 +163,7 @@
------------------------------------------------------- ----- ----
total 6 12
Tearing down left over layers:
- Tear down zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Tear down zope.testrunner.layer.UnitTests in N.NNN seconds.
It is instructive to analyze the results in some detail. The test
being run was designed to intentionally leak:
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-profiling-cprofiler.txt
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-profiling-cprofiler.txt 2010-04-19 08:11:17 UTC (rev 111062)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-profiling-cprofiler.txt 2010-04-19 08:57:49 UTC (rev 111063)
@@ -17,7 +17,7 @@
When the tests are run, we get profiling output::
- >>> from zope.testing import testrunner
+ >>> from zope import testrunner
>>> testrunner.run_internal(defaults)
Running...
...
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-profiling.txt
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-profiling.txt 2010-04-19 08:11:17 UTC (rev 111062)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-profiling.txt 2010-04-19 08:57:49 UTC (rev 111063)
@@ -23,13 +23,13 @@
When the tests are run, we get profiling output.
- >>> from zope.testing import testrunner
+ >>> from zope import testrunner
>>> testrunner.run_internal(defaults)
Running samplelayers.Layer1 tests:
...
Running samplelayers.Layer11 tests:
...
- Running zope.testing.testrunner.layer.UnitTests tests:
+ Running zope.testrunner.layer.UnitTests tests:
...
ncalls tottime percall cumtime percall filename:lineno(function)
...
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-progress.txt
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-progress.txt 2010-04-19 08:11:17 UTC (rev 111062)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-progress.txt 2010-04-19 08:57:49 UTC (rev 111063)
@@ -14,7 +14,7 @@
... ]
>>> sys.argv = 'test --layer 122 -p'.split()
- >>> from zope.testing import testrunner
+ >>> from zope import testrunner
>>> testrunner.run_internal(defaults)
Running samplelayers.Layer122 tests:
Set up samplelayers.Layer1 in 0.000 seconds.
@@ -379,8 +379,8 @@
>>> sys.argv = 'test -u -t test_one.TestNotMuch --auto-progress'.split()
>>> testrunner.run_internal(defaults)
- Running zope.testing.testrunner.layer.UnitTests tests:
- Set up zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Running zope.testrunner.layer.UnitTests tests:
+ Set up zope.testrunner.layer.UnitTests in N.NNN seconds.
Running:
1/6 (16.7%)##r##
##r##
@@ -396,7 +396,7 @@
##r##
Ran 6 tests with 0 failures and 0 errors in N.NNN seconds.
Tearing down left over layers:
- Tear down zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Tear down zope.testrunner.layer.UnitTests in N.NNN seconds.
False
@@ -406,11 +406,11 @@
>>> sys.argv = 'test -u -t test_one.TestNotMuch --auto-progress'.split()
>>> testrunner.run_internal(defaults)
- Running zope.testing.testrunner.layer.UnitTests tests:
- Set up zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Running zope.testrunner.layer.UnitTests tests:
+ Set up zope.testrunner.layer.UnitTests in N.NNN seconds.
Ran 6 tests with 0 failures and 0 errors in N.NNN seconds.
Tearing down left over layers:
- Tear down zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Tear down zope.testrunner.layer.UnitTests in N.NNN seconds.
False
@@ -423,9 +423,9 @@
>>> sys.argv = 'test -u -t test_one.TestNotMuch -p --no-progress'.split()
>>> testrunner.run_internal(defaults)
- Running zope.testing.testrunner.layer.UnitTests tests:
- Set up zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Running zope.testrunner.layer.UnitTests tests:
+ Set up zope.testrunner.layer.UnitTests in N.NNN seconds.
Ran 6 tests with 0 failures and 0 errors in N.NNN seconds.
Tearing down left over layers:
- Tear down zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Tear down zope.testrunner.layer.UnitTests in N.NNN seconds.
False
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-repeat.txt
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-repeat.txt 2010-04-19 08:11:17 UTC (rev 111062)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-repeat.txt 2010-04-19 08:57:49 UTC (rev 111063)
@@ -13,7 +13,7 @@
... ]
>>> sys.argv = 'test --layer 112 --layer UnitTests --repeat 3'.split()
- >>> from zope.testing import testrunner
+ >>> from zope import testrunner
>>> testrunner.run_internal(defaults)
Running samplelayers.Layer112 tests:
Set up samplelayers.Layerx in 0.000 seconds.
@@ -26,12 +26,12 @@
Ran 34 tests with 0 failures and 0 errors in 0.010 seconds.
Iteration 3
Ran 34 tests with 0 failures and 0 errors in 0.010 seconds.
- Running zope.testing.testrunner.layer.UnitTests tests:
+ Running zope.testrunner.layer.UnitTests tests:
Tear down samplelayers.Layer112 in N.NNN seconds.
Tear down samplelayers.Layerx in N.NNN seconds.
Tear down samplelayers.Layer11 in N.NNN seconds.
Tear down samplelayers.Layer1 in N.NNN seconds.
- Set up zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Set up zope.testrunner.layer.UnitTests in N.NNN seconds.
Iteration 1
Ran 192 tests with 0 failures and 0 errors in N.NNN seconds.
Iteration 2
@@ -39,7 +39,7 @@
Iteration 3
Ran 192 tests with 0 failures and 0 errors in N.NNN seconds.
Tearing down left over layers:
- Tear down zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Tear down zope.testrunner.layer.UnitTests in N.NNN seconds.
Total: 226 tests, 0 failures, 0 errors in N.NNN seconds.
False
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-shuffle.txt
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-shuffle.txt 2010-04-19 08:11:17 UTC (rev 111062)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-shuffle.txt 2010-04-19 08:57:49 UTC (rev 111063)
@@ -17,7 +17,7 @@
... '--tests-pattern', '^sampletestsf?$',
... ]
- >>> from zope.testing import testrunner
+ >>> from zope import testrunner
>>> default_argv = 'test -u -m sample1 -t test_y0 --list-tests '
Running shuffled tests
@@ -29,7 +29,7 @@
>>> argv = (default_argv + '--shuffle').split()
>>> testrunner.run_internal(defaults, argv)
Tests were shuffled using seed number ...
- Listing zope.testing.testrunner.layer.UnitTests tests:
+ Listing zope.testrunner.layer.UnitTests tests:
...
False
@@ -52,7 +52,7 @@
>>> argv = (default_argv + '--shuffle --shuffle-seed 0').split()
>>> testrunner.run_internal(defaults, argv)
Tests were shuffled using seed number 0.
- Listing zope.testing.testrunner.layer.UnitTests tests:
+ Listing zope.testrunner.layer.UnitTests tests:
test_y0 (sample1.sampletestsf.TestA)
test_y0 (sample1.sampletests.test_one)
test_y0 (sample1.sampletests.test1.TestA)
@@ -66,7 +66,7 @@
False
>>> testrunner.run_internal(defaults, argv)
Tests were shuffled using seed number 0.
- Listing zope.testing.testrunner.layer.UnitTests tests:
+ Listing zope.testrunner.layer.UnitTests tests:
test_y0 (sample1.sampletestsf.TestA)
test_y0 (sample1.sampletests.test_one)
test_y0 (sample1.sampletests.test1.TestA)
@@ -85,7 +85,7 @@
>>> argv = (default_argv + '--shuffle --shuffle-seed 42').split()
>>> testrunner.run_internal(defaults, argv)
Tests were shuffled using seed number 42.
- Listing zope.testing.testrunner.layer.UnitTests tests:
+ Listing zope.testrunner.layer.UnitTests tests:
test_y0 (sample1.sample13.sampletests.TestA)
test_y0 (sample1.sample13.sampletests)
test_y0 (sample1.sampletests.test1)
@@ -99,7 +99,7 @@
False
>>> testrunner.run_internal(defaults, argv)
Tests were shuffled using seed number 42.
- Listing zope.testing.testrunner.layer.UnitTests tests:
+ Listing zope.testrunner.layer.UnitTests tests:
test_y0 (sample1.sample13.sampletests.TestA)
test_y0 (sample1.sample13.sampletests)
test_y0 (sample1.sampletests.test1)
@@ -120,7 +120,7 @@
>>> argv = (default_argv + '--shuffle-seed 42').split()
>>> testrunner.run_internal(defaults, argv)
- Listing zope.testing.testrunner.layer.UnitTests tests:
+ Listing zope.testrunner.layer.UnitTests tests:
test_y0 (sample1.sampletestsf.TestA)
test_y0 (sample1.sampletestsf)
test_y0 (sample1.sample11.sampletests.TestA)
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-simple.txt
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-simple.txt 2010-04-19 08:11:17 UTC (rev 111062)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-simple.txt 2010-04-19 08:57:49 UTC (rev 111063)
@@ -43,7 +43,7 @@
Now, if we run the tests, without any other options:
- >>> from zope.testing import testrunner
+ >>> from zope import testrunner
>>> import sys
>>> sys.argv = ['test']
>>> testrunner.run_internal(defaults)
@@ -74,14 +74,14 @@
Tear down samplelayers.Layer121 in N.NNN seconds.
Set up samplelayers.Layer122 in N.NNN seconds.
Ran 34 tests with 0 failures and 0 errors in N.NNN seconds.
- Running zope.testing.testrunner.layer.UnitTests tests:
+ Running zope.testrunner.layer.UnitTests tests:
Tear down samplelayers.Layer122 in N.NNN seconds.
Tear down samplelayers.Layer12 in N.NNN seconds.
Tear down samplelayers.Layer1 in N.NNN seconds.
- Set up zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Set up zope.testrunner.layer.UnitTests in N.NNN seconds.
Ran 192 tests with 0 failures and 0 errors in N.NNN seconds.
Tearing down left over layers:
- Tear down zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Tear down zope.testrunner.layer.UnitTests in N.NNN seconds.
Total: 405 tests, 0 failures, 0 errors in N.NNN seconds.
False
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-subunit-err.txt
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-subunit-err.txt 2010-04-19 08:11:17 UTC (rev 111062)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-subunit-err.txt 2010-04-19 08:57:49 UTC (rev 111063)
@@ -11,7 +11,7 @@
... '--tests-pattern', '^sampletestsf?$',
... ]
- >>> from zope.testing import testrunner
+ >>> from zope import testrunner
>>> sys.argv = 'test --subunit'.split()
>>> _ = testrunner.run_internal(defaults)
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-subunit-leaks.txt
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-subunit-leaks.txt 2010-04-19 08:11:17 UTC (rev 111062)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-subunit-leaks.txt 2010-04-19 08:57:49 UTC (rev 111063)
@@ -15,7 +15,7 @@
... '--tests-pattern', '^sampletestsf?$',
... ]
- >>> from zope.testing import testrunner
+ >>> from zope import testrunner
Each layer is repeated the requested number of times. For each
iteration after the first, the system refcount and change in system
@@ -29,11 +29,11 @@
>>> sys.argv = 'test --subunit --tests-pattern leak -N2 -r'.split()
>>> _ = testrunner.run_internal(defaults)
time: YYYY-MM-DD HH:MM:SS.mmmmmmZ
- test: zope.testing.testrunner.layer.UnitTests:setUp
+ test: zope.testrunner.layer.UnitTests:setUp
tags: zope:layer
time: YYYY-MM-DD HH:MM:SS.mmmmmmZ
- successful: zope.testing.testrunner.layer.UnitTests:setUp
- tags: zope:layer:zope.testing.testrunner.layer.UnitTests
+ successful: zope.testrunner.layer.UnitTests:setUp
+ tags: zope:layer:zope.testrunner.layer.UnitTests
test: leak.TestSomething.testleak
successful: leak.TestSomething.testleak
test: leak.TestSomething.testleak
@@ -54,12 +54,12 @@
...\r
<BLANKLINE>
]
- tags: -zope:layer:zope.testing.testrunner.layer.UnitTests
+ tags: -zope:layer:zope.testrunner.layer.UnitTests
time: YYYY-MM-DD HH:MM:SS.mmmmmmZ
- test: zope.testing.testrunner.layer.UnitTests:tearDown
+ test: zope.testrunner.layer.UnitTests:tearDown
tags: zope:layer
time: YYYY-MM-DD HH:MM:SS.mmmmmmZ
- successful: zope.testing.testrunner.layer.UnitTests:tearDown
+ successful: zope.testrunner.layer.UnitTests:tearDown
Here we see that the system refcount is increasing. If we specify a
verbosity greater than one, we can get details broken out by object
@@ -68,11 +68,11 @@
>>> sys.argv = 'test --subunit --tests-pattern leak -N2 -v -r'.split()
>>> _ = testrunner.run_internal(defaults)
time: YYYY-MM-DD HH:MM:SS.mmmmmmZ
- test: zope.testing.testrunner.layer.UnitTests:setUp
+ test: zope.testrunner.layer.UnitTests:setUp
tags: zope:layer
time: YYYY-MM-DD HH:MM:SS.mmmmmmZ
- successful: zope.testing.testrunner.layer.UnitTests:setUp
- tags: zope:layer:zope.testing.testrunner.layer.UnitTests
+ successful: zope.testrunner.layer.UnitTests:setUp
+ tags: zope:layer:zope.testrunner.layer.UnitTests
test: leak.TestSomething.testleak
successful: leak.TestSomething.testleak
test: leak.TestSomething.testleak
@@ -99,9 +99,9 @@
...
<BLANKLINE>
]
- tags: -zope:layer:zope.testing.testrunner.layer.UnitTests
+ tags: -zope:layer:zope.testrunner.layer.UnitTests
time: YYYY-MM-DD HH:MM:SS.mmmmmmZ
- test: zope.testing.testrunner.layer.UnitTests:tearDown
+ test: zope.testrunner.layer.UnitTests:tearDown
tags: zope:layer
time: YYYY-MM-DD HH:MM:SS.mmmmmmZ
- successful: zope.testing.testrunner.layer.UnitTests:tearDown
+ successful: zope.testrunner.layer.UnitTests:tearDown
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-subunit.txt
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-subunit.txt 2010-04-19 08:11:17 UTC (rev 111062)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-subunit.txt 2010-04-19 08:57:49 UTC (rev 111063)
@@ -11,7 +11,7 @@
... '--tests-pattern', '^sampletestsf?$',
... ]
- >>> from zope.testing import testrunner
+ >>> from zope import testrunner
Basic output
@@ -224,11 +224,11 @@
... ]
>>> testrunner.run_internal(defaults)
time: 2010-02-05 15:27:05.113541Z
- test: zope.testing.testrunner.layer.UnitTests:setUp
+ test: zope.testrunner.layer.UnitTests:setUp
tags: zope:layer
time: 2010-02-05 15:27:05.113545Z
- successful: zope.testing.testrunner.layer.UnitTests:setUp
- tags: zope:layer:zope.testing.testrunner.layer.UnitTests
+ successful: zope.testrunner.layer.UnitTests:setUp
+ tags: zope:layer:zope.testrunner.layer.UnitTests
test: sample2.sampletests_e.eek
failure: sample2.sampletests_e.eek [ multipart
Content-Type: text/x-traceback;charset=utf8,language=python
@@ -311,12 +311,12 @@
0\r
<BLANKLINE>
]
- tags: -zope:layer:zope.testing.testrunner.layer.UnitTests
+ tags: -zope:layer:zope.testrunner.layer.UnitTests
time: 2010-02-05 15:27:05.147082Z
- test: zope.testing.testrunner.layer.UnitTests:tearDown
+ test: zope.testrunner.layer.UnitTests:tearDown
tags: zope:layer
time: 2010-02-05 15:27:05.147088Z
- successful: zope.testing.testrunner.layer.UnitTests:tearDown
+ successful: zope.testrunner.layer.UnitTests:tearDown
True
@@ -329,7 +329,7 @@
>>> import os.path, sys
>>> directory_with_tests = os.path.join(this_directory, 'testrunner-ex')
- >>> from zope.testing import testrunner
+ >>> from zope import testrunner
>>> defaults = [
... '--subunit',
... '--path', directory_with_tests,
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-test-selection.txt
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-test-selection.txt 2010-04-19 08:11:17 UTC (rev 111062)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-test-selection.txt 2010-04-19 08:57:49 UTC (rev 111063)
@@ -12,7 +12,7 @@
... ]
>>> sys.argv = 'test --layer 122 -ssample1 -vv'.split()
- >>> from zope.testing import testrunner
+ >>> from zope import testrunner
>>> testrunner.run_internal(defaults)
Running tests at level 1
Running samplelayers.Layer122 tests:
@@ -45,8 +45,8 @@
>>> sys.argv = 'test -u -vv -ssample1 -ssample2'.split()
>>> testrunner.run_internal(defaults)
Running tests at level 1
- Running zope.testing.testrunner.layer.UnitTests tests:
- Set up zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Running zope.testrunner.layer.UnitTests tests:
+ Set up zope.testrunner.layer.UnitTests in N.NNN seconds.
Running:
test_x1 (sample1.sampletestsf.TestA)
test_y0 (sample1.sampletestsf.TestA)
@@ -154,7 +154,7 @@
testrunner-ex/sample2/sampletests/../../sampletests.txt
Ran 128 tests with 0 failures and 0 errors in N.NNN seconds.
Tearing down left over layers:
- Tear down zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Tear down zope.testrunner.layer.UnitTests in N.NNN seconds.
False
You can specify directory names instead of packages (useful for
@@ -162,7 +162,7 @@
>>> subdir = os.path.join(directory_with_tests, 'sample1')
>>> sys.argv = ['test', '--layer', '122', '-s', subdir, '-vv']
- >>> from zope.testing import testrunner
+ >>> from zope import testrunner
>>> testrunner.run_internal(defaults)
Running tests at level 1
Running samplelayers.Layer122 tests:
@@ -195,8 +195,8 @@
>>> sys.argv = 'test -u -vv -ssample1 -m_one -mtest1'.split()
>>> testrunner.run_internal(defaults)
Running tests at level 1
- Running zope.testing.testrunner.layer.UnitTests tests:
- Set up zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Running zope.testrunner.layer.UnitTests tests:
+ Set up zope.testrunner.layer.UnitTests in N.NNN seconds.
Running:
test_x1 (sample1.sampletests.test1.TestA)
test_y0 (sample1.sampletests.test1.TestA)
@@ -226,7 +226,7 @@
testrunner-ex/sample1/sampletests/../../sampletests.txt
Ran 32 tests with 0 failures and 0 errors in N.NNN seconds.
Tearing down left over layers:
- Tear down zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Tear down zope.testrunner.layer.UnitTests in N.NNN seconds.
False
@@ -235,8 +235,8 @@
>>> sys.argv = 'test -u -vv -ssample1 -m_one -mtest1 -tx0 -ty0'.split()
>>> testrunner.run_internal(defaults)
Running tests at level 1
- Running zope.testing.testrunner.layer.UnitTests tests:
- Set up zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Running zope.testrunner.layer.UnitTests tests:
+ Set up zope.testrunner.layer.UnitTests in N.NNN seconds.
Running:
test_y0 (sample1.sampletests.test1.TestA)
test_x0 (sample1.sampletests.test1.TestB)
@@ -248,15 +248,15 @@
test_y0 (sample1.sampletests.test_one)
Ran 8 tests with 0 failures and 0 errors in N.NNN seconds.
Tearing down left over layers:
- Tear down zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Tear down zope.testrunner.layer.UnitTests in N.NNN seconds.
False
>>> sys.argv = 'test -u -vv -ssample1 -ttxt'.split()
>>> testrunner.run_internal(defaults)
Running tests at level 1
- Running zope.testing.testrunner.layer.UnitTests tests:
- Set up zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Running zope.testrunner.layer.UnitTests tests:
+ Set up zope.testrunner.layer.UnitTests in N.NNN seconds.
Running:
testrunner-ex/sample1/../sampletests.txt
testrunner-ex/sample1/sample11/../../sampletests.txt
@@ -265,7 +265,7 @@
testrunner-ex/sample1/sampletests/../../sampletests.txt
Ran 20 tests with 0 failures and 0 errors in N.NNN seconds.
Tearing down left over layers:
- Tear down zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Tear down zope.testrunner.layer.UnitTests in N.NNN seconds.
False
@@ -276,8 +276,8 @@
>>> sys.argv = 'test -u -vv -ssample1 -m!sample1[.]sample1'.split()
>>> testrunner.run_internal(defaults)
Running tests at level 1
- Running zope.testing.testrunner.layer.UnitTests tests:
- Set up zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Running zope.testrunner.layer.UnitTests tests:
+ Set up zope.testrunner.layer.UnitTests in N.NNN seconds.
Running:
test_x1 (sample1.sampletestsf.TestA)
test_y0 (sample1.sampletestsf.TestA)
@@ -320,7 +320,7 @@
testrunner-ex/sample1/sampletests/../../sampletests.txt
Ran 48 tests with 0 failures and 0 errors in N.NNN seconds.
Tearing down left over layers:
- Tear down zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Tear down zope.testrunner.layer.UnitTests in N.NNN seconds.
False
@@ -330,8 +330,8 @@
>>> sys.argv = 'test -u -vv -ssample1 !sample1[.]sample1'.split()
>>> testrunner.run_internal(defaults)
Running tests at level 1
- Running zope.testing.testrunner.layer.UnitTests tests:
- Set up zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Running zope.testrunner.layer.UnitTests tests:
+ Set up zope.testrunner.layer.UnitTests in N.NNN seconds.
Running:
test_x1 (sample1.sampletestsf.TestA)
test_y0 (sample1.sampletestsf.TestA)
@@ -374,15 +374,15 @@
testrunner-ex/sample1/sampletests/../../sampletests.txt
Ran 48 tests with 0 failures and 0 errors in N.NNN seconds.
Tearing down left over layers:
- Tear down zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Tear down zope.testrunner.layer.UnitTests in N.NNN seconds.
False
>>> sys.argv = 'test -u -vv -ssample1 . txt'.split()
>>> testrunner.run_internal(defaults)
Running tests at level 1
- Running zope.testing.testrunner.layer.UnitTests tests:
- Set up zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Running zope.testrunner.layer.UnitTests tests:
+ Set up zope.testrunner.layer.UnitTests in N.NNN seconds.
Running:
testrunner-ex/sample1/../sampletests.txt
testrunner-ex/sample1/sample11/../../sampletests.txt
@@ -391,7 +391,7 @@
testrunner-ex/sample1/sampletests/../../sampletests.txt
Ran 20 tests with 0 failures and 0 errors in N.NNN seconds.
Tearing down left over layers:
- Tear down zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Tear down zope.testrunner.layer.UnitTests in N.NNN seconds.
False
Sometimes, There are tests that you don't want to run by default.
@@ -405,8 +405,8 @@
>>> sys.argv = 'test -u -vv -t test_y1 -t test_y0'.split()
>>> testrunner.run_internal(defaults)
Running tests at level 1
- Running zope.testing.testrunner.layer.UnitTests tests:
- Set up zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Running zope.testrunner.layer.UnitTests tests:
+ Set up zope.testrunner.layer.UnitTests in N.NNN seconds.
Running:
test_y0 (sampletestsf.TestA)
test_y1 (sampletestsf.TestB)
@@ -446,7 +446,7 @@
test_y0 (sampletests.test_one)
Ran 36 tests with 0 failures and 0 errors in N.NNN seconds.
Tearing down left over layers:
- Tear down zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Tear down zope.testrunner.layer.UnitTests in N.NNN seconds.
False
@@ -456,8 +456,8 @@
>>> sys.argv = 'test -u -vv -a 2 -t test_y1 -t test_y0'.split()
>>> testrunner.run_internal(defaults)
Running tests at level 2
- Running zope.testing.testrunner.layer.UnitTests tests:
- Set up zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Running zope.testrunner.layer.UnitTests tests:
+ Set up zope.testrunner.layer.UnitTests in N.NNN seconds.
Running:
test_y0 (sampletestsf.TestA)
test_y0 (sampletestsf.TestA2)
@@ -499,7 +499,7 @@
test_y0 (sampletests.test_one)
Ran 38 tests with 0 failures and 0 errors in N.NNN seconds.
Tearing down left over layers:
- Tear down zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Tear down zope.testrunner.layer.UnitTests in N.NNN seconds.
False
@@ -508,8 +508,8 @@
>>> sys.argv = 'test -u -vv --all -t test_y1 -t test_y0'.split()
>>> testrunner.run_internal(defaults)
Running tests at all levels
- Running zope.testing.testrunner.layer.UnitTests tests:
- Set up zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Running zope.testrunner.layer.UnitTests tests:
+ Set up zope.testrunner.layer.UnitTests in N.NNN seconds.
Running:
test_y0 (sampletestsf.TestA)
test_y0 (sampletestsf.TestA2)
@@ -552,7 +552,7 @@
test_y0 (sampletests.test_one)
Ran 39 tests with 0 failures and 0 errors in N.NNN seconds.
Tearing down left over layers:
- Tear down zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Tear down zope.testrunner.layer.UnitTests in N.NNN seconds.
False
@@ -583,7 +583,7 @@
Listing samplelayers.Layer122 tests:
test_y0 (sample1.sampletests.test122.TestA)
test_y0 (sample1.sampletests.test122)
- Listing zope.testing.testrunner.layer.UnitTests tests:
+ Listing zope.testrunner.layer.UnitTests tests:
test_y0 (sample1.sampletestsf.TestA)
test_y0 (sample1.sampletestsf)
test_y0 (sample1.sample11.sampletests.TestA)
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-verbose.txt
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-verbose.txt 2010-04-19 08:11:17 UTC (rev 111062)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-verbose.txt 2010-04-19 08:57:49 UTC (rev 111063)
@@ -14,7 +14,7 @@
... '--tests-pattern', '^sampletestsf?$',
... ]
>>> sys.argv = 'test --layer 122 -v'.split()
- >>> from zope.testing import testrunner
+ >>> from zope import testrunner
>>> testrunner.run_internal(defaults)
Running tests at level 1
Running samplelayers.Layer122 tests:
@@ -36,13 +36,13 @@
>>> sys.argv = 'test -uv'.split()
>>> testrunner.run_internal(defaults)
Running tests at level 1
- Running zope.testing.testrunner.layer.UnitTests tests:
- Set up zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Running zope.testrunner.layer.UnitTests tests:
+ Set up zope.testrunner.layer.UnitTests in N.NNN seconds.
Running:
................................................................................................................................................................................................
Ran 192 tests with 0 failures and 0 errors in 0.035 seconds.
Tearing down left over layers:
- Tear down zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Tear down zope.testrunner.layer.UnitTests in N.NNN seconds.
False
If the --verbose (-v) option is used twice, then the name and location of
@@ -146,9 +146,9 @@
... ]
>>> sys.argv = 'test -q -u'.split()
>>> testrunner.run_internal(defaults)
- Running zope.testing.testrunner.layer.UnitTests tests:
- Set up zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Running zope.testrunner.layer.UnitTests tests:
+ Set up zope.testrunner.layer.UnitTests in N.NNN seconds.
Ran 192 tests with 0 failures and 0 errors in 0.034 seconds.
Tearing down left over layers:
- Tear down zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Tear down zope.testrunner.layer.UnitTests in N.NNN seconds.
False
Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-wo-source.txt
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-wo-source.txt 2010-04-19 08:11:17 UTC (rev 111062)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-wo-source.txt 2010-04-19 08:57:49 UTC (rev 111063)
@@ -33,7 +33,7 @@
Now run the tests in the copy:
- >>> from zope.testing import testrunner
+ >>> from zope import testrunner
>>> mydefaults = [
... '--path', directory_with_tests,
@@ -44,8 +44,8 @@
>>> sys.argv = ['test']
>>> testrunner.run_internal(mydefaults)
Running tests at level 1
- Running zope.testing.testrunner.layer.UnitTests tests:
- Set up zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Running zope.testrunner.layer.UnitTests tests:
+ Set up zope.testrunner.layer.UnitTests in N.NNN seconds.
Running:
test1 (unlikely_package_name.compiletest.Test)
test2 (unlikely_package_name.compiletest.Test)
@@ -53,7 +53,7 @@
test2 (unlikely_package_name.package.compiletest.Test)
Ran 4 tests with 0 failures and 0 errors in N.NNN seconds.
Tearing down left over layers:
- Tear down zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Tear down zope.testrunner.layer.UnitTests in N.NNN seconds.
False
@@ -79,8 +79,8 @@
>>> testrunner.run_internal(mydefaults, ["test", "--usecompiled"])
Running tests at level 1
- Running zope.testing.testrunner.layer.UnitTests tests:
- Set up zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Running zope.testrunner.layer.UnitTests tests:
+ Set up zope.testrunner.layer.UnitTests in N.NNN seconds.
Running:
test1 (unlikely_package_name.compiletest.Test)
test2 (unlikely_package_name.compiletest.Test)
@@ -88,7 +88,7 @@
test2 (unlikely_package_name.package.compiletest.Test)
Ran 4 tests with 0 failures and 0 errors in N.NNN seconds.
Tearing down left over layers:
- Tear down zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Tear down zope.testrunner.layer.UnitTests in N.NNN seconds.
False
Modified: zope.testrunner/trunk/src/zope/testrunner/tests.py
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/tests.py 2010-04-19 08:11:17 UTC (rev 111062)
+++ zope.testrunner/trunk/src/zope/testrunner/tests.py 2010-04-19 08:57:49 UTC (rev 111063)
@@ -189,11 +189,11 @@
setUp=setUp, tearDown=tearDown,
optionflags=doctest.ELLIPSIS+doctest.NORMALIZE_WHITESPACE,
checker=checker),
- doctest.DocTestSuite('zope.testing.testrunner'),
- doctest.DocTestSuite('zope.testing.testrunner.coverage',
+ doctest.DocTestSuite('zope.testrunner'),
+ doctest.DocTestSuite('zope.testrunner.coverage',
optionflags=doctest.ELLIPSIS+doctest.NORMALIZE_WHITESPACE),
- doctest.DocTestSuite('zope.testing.testrunner.options'),
- doctest.DocTestSuite('zope.testing.testrunner.find'),
+ doctest.DocTestSuite('zope.testrunner.options'),
+ doctest.DocTestSuite('zope.testrunner.find'),
]
if sys.platform == 'win32':
More information about the checkins
mailing list