[Checkins] SVN: z3c.testsetup/trunk/src/z3c/testsetup/ Fix tests to accept both, zope.testing.testrunner and zope.testrunner.
Uli Fouquet
uli at gnufix.de
Fri Jul 23 20:58:12 EDT 2010
Log message for revision 114976:
Fix tests to accept both, zope.testing.testrunner and zope.testrunner.
Changed:
U z3c.testsetup/trunk/src/z3c/testsetup/README.txt
U z3c.testsetup/trunk/src/z3c/testsetup/nozopeapptesting.txt
U z3c.testsetup/trunk/src/z3c/testsetup/testrunner.txt
U z3c.testsetup/trunk/src/z3c/testsetup/tests/setupininit.txt
-=-
Modified: z3c.testsetup/trunk/src/z3c/testsetup/README.txt
===================================================================
--- z3c.testsetup/trunk/src/z3c/testsetup/README.txt 2010-07-24 00:57:19 UTC (rev 114975)
+++ z3c.testsetup/trunk/src/z3c/testsetup/README.txt 2010-07-24 00:58:12 UTC (rev 114976)
@@ -133,13 +133,13 @@
Ran 1 tests with 0 failures and 0 errors in 0.009 seconds.
Tear down z3c.testsetup.tests.othercave.testing.UnitLayer2 in 0.000 seconds.
Tear down z3c.testsetup.tests.othercave.testing.UnitLayer1 in 0.000 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 0.000 seconds.
+ Set up zope...testrunner.layer.UnitTests in 0.000 seconds.
Custom setUp for <DocTest doctest05.txt from ...doctest05.txt:0 (2 examples)>
Custom tearDown for <DocTest doctest05.txt from ...doctest05.txt:0 (2 examples)>
Ran 4 tests with 0 failures and 0 errors in 0.011 seconds.
- Tear down zope.testing.testrunner.layer.UnitTests in 0.000 seconds.
+ Tear down zope...testrunner.layer.UnitTests in 0.000 seconds.
Total: 10 tests, 0 failures, 0 errors in 11.798 seconds.
False
Modified: z3c.testsetup/trunk/src/z3c/testsetup/nozopeapptesting.txt
===================================================================
--- z3c.testsetup/trunk/src/z3c/testsetup/nozopeapptesting.txt 2010-07-24 00:57:19 UTC (rev 114975)
+++ z3c.testsetup/trunk/src/z3c/testsetup/nozopeapptesting.txt 2010-07-24 00:58:12 UTC (rev 114976)
@@ -62,11 +62,11 @@
>>> sys.argv = 'test '.split()
>>> from z3c.testsetup import testrunner
>>> testrunner.run(defaults)
- Running zope.testing.testrunner.layer.UnitTests tests:
- Set up zope.testing.testrunner.layer.UnitTests in ... seconds.
+ Running zope...testrunner.layer.UnitTests tests:
+ Set up zope...testrunner.layer.UnitTests in ... seconds.
Ran 2 tests with 0 failures and 0 errors in ... seconds.
Tearing down left over layers:
- Tear down zope.testing.testrunner.layer.UnitTests in ... seconds.
+ Tear down zope...testrunner.layer.UnitTests in ... seconds.
False
As we can see, only unit test were run and no functional ones anymore.
Modified: z3c.testsetup/trunk/src/z3c/testsetup/testrunner.txt
===================================================================
--- z3c.testsetup/trunk/src/z3c/testsetup/testrunner.txt 2010-07-24 00:57:19 UTC (rev 114975)
+++ z3c.testsetup/trunk/src/z3c/testsetup/testrunner.txt 2010-07-24 00:58:12 UTC (rev 114976)
@@ -40,12 +40,12 @@
Running z3c.testsetup.functional.doctesting.FunctionalLayer tests:
Set up z3c...functional.doctesting.FunctionalLayer 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 z3c...functional.doctesting.FunctionalLayer ...
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 2 tests with 0 failures and 0 errors in N.NNN seconds.
- 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.
False
@@ -74,12 +74,12 @@
Running z3c.testsetup.functional.doctesting.FunctionalLayer tests:
Set up z3c.testsetup...doctesting.FunctionalLayer 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 z3c.testsetup...doctesting.FunctionalLayer ...
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 1 tests with 0 failures and 0 errors in N.NNN seconds.
- Tear down zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Tear down zope...testrunner.layer.UnitTests in N.NNN seconds.
Total: 3 tests, 0 failures, 0 errors in N.NNN seconds.
False
@@ -106,12 +106,12 @@
Running z3c.testsetup.functional.doctesting.FunctionalLayer tests:
Set up z3c.testsetup...doctesting.FunctionalLayer 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 z3c.testsetup...doctesting.FunctionalLayer ...
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 1 tests with 0 failures and 0 errors in N.NNN seconds.
- Tear down zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Tear down zope...testrunner.layer.UnitTests in N.NNN seconds.
Total: 3 tests, 0 failures, 0 errors in N.NNN seconds.
False
@@ -137,13 +137,13 @@
... ]
>>> testrunner.run(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:
testFoo (z3c.testsetup.tests.cave.file1.TestTest)
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
@@ -187,12 +187,12 @@
Running z3c.testsetup.tests.cave.SampleLayer tests:
Set up z3c.testsetup.tests.cave.SampleLayer 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 z3c.testsetup.tests.cave.SampleLayer ... not supported
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 2 tests with 0 failures and 0 errors in N.NNN seconds.
- 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.
False
@@ -217,12 +217,12 @@
Running z3c.testsetup.tests.cave.SampleLayer tests:
Set up z3c.testsetup.tests.cave.SampleLayer 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 z3c.testsetup.tests.cave.SampleLayer ...
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 2 tests with 0 failures and 0 errors in N.NNN seconds.
- 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.
False
@@ -295,12 +295,12 @@
Running z3c.testsetup...doctesting.FunctionalLayer tests:
Set up z3c.testsetup...doctesting.FunctionalLayer in N.NNN seconds.
Ran 1 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 z3c.testsetup...doctesting.FunctionalLayer ...
Running in a subprocess.
- Set up zope.testing.testrunner.layer.UnitTests in 0.000 seconds.
+ Set up zope...testrunner.layer.UnitTests in 0.000 seconds.
Ran 1 tests with 0 failures and 0 errors in N.NNN seconds.
- Tear down zope.testing.testrunner.layer.UnitTests in 0.000 seconds.
+ Tear down zope...testrunner.layer.UnitTests in 0.000 seconds.
Total: 2 tests, 0 failures, 0 errors in N.NNN seconds.
False
@@ -316,9 +316,7 @@
<BLANKLINE>
<BLANKLINE>
Failure in test /.../z3c/testsetup/tests/cave/checkertest.chk
- Traceback (most recent call last):
- ...
- AssertionError: Failed doctest test for checkertest.chk
+ ...Failed doctest test for checkertest.chk
File "/.../z3c/testsetup/tests/cave/checkertest.chk", line 0
<BLANKLINE>
----------------------------------------------------------------------
@@ -337,16 +335,14 @@
+ A memory address at 0x1a0322ff
<BLANKLINE>
Ran 1 tests with 1 failures and 0 errors in ... seconds.
- Running zope.testing.testrunner.layer.UnitTests tests:
+ Running zope...testrunner.layer.UnitTests tests:
Tear down z3c.testsetup...doctesting.FunctionalLayer ... not supported
Running in a subprocess.
- Set up zope.testing.testrunner.layer.UnitTests in ... seconds.
+ Set up zope...testrunner.layer.UnitTests in ... seconds.
<BLANKLINE>
<BLANKLINE>
Failure in test /.../z3c/testsetup/tests/cave/checkertest.chk
- Traceback (most recent call last):
- ...
- AssertionError: Failed doctest test for checkertest.chk
+ ...Failed doctest test for checkertest.chk
File "/.../z3c/testsetup/tests/cave/checkertest.chk", line 0
<BLANKLINE>
----------------------------------------------------------------------
@@ -365,7 +361,7 @@
+ A memory address at 0x1a0322ff
<BLANKLINE>
Ran 1 tests with 1 failures and 0 errors in ... seconds.
- Tear down zope.testing.testrunner.layer.UnitTests in ... seconds.
+ Tear down zope...testrunner.layer.UnitTests in ... seconds.
Total: 2 tests, 2 failures, 0 errors in ... seconds.
True
@@ -477,11 +473,11 @@
... '--tests-pattern', '^samplesetup_short9$',
... ]
>>> 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 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.
False
@@ -526,12 +522,12 @@
Running z3c.testsetup.functional.doctesting.FunctionalLayer tests:
Set up z3c.testsetup...doctesting.FunctionalLayer 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 z3c.testsetup...doctesting.FunctionalLayer ...
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 1 tests with 0 failures and 0 errors in N.NNN seconds.
- Tear down zope.testing.testrunner.layer.UnitTests in N.NNN seconds.
+ Tear down zope...testrunner.layer.UnitTests in N.NNN seconds.
Total: 3 tests, 0 failures, 0 errors in N.NNN seconds.
False
@@ -650,19 +646,24 @@
it hard to test with packages, that sometimes use `zope.testing`_
>= 3.7.3 but are also used with `zope.testing`_ < 3.7.3.
+Furthermore the whole testrunner was moved from
+`zope.testing.testrunner` to an own package `zope.testrunner`.
+
For those cases (i.e. where testrunners are run as part of tests
themselves) `z3c.testsetup` now offers the convenience functions
`testrunner.run()` and `testrunner.run_internal()` that are wrappers
guaranteed to be aliases for the same function of `zope.testing`:
``zope.testing.testrunner.run_internal()`` if it exists or
-``zope.testing.testrunner.run()`` otherwise.
+``zope.testing.testrunner.run()`` otherwise. If `zope.testrunner` is
+available, the respective functions are imported from there.
In doctests you now can use
>>> from z3c.testsetup import testrunner
call ``testrunner.run()`` afterwards and it will work, regardless of
-what version of `zope.testing` you are using.
+what version of `zope.testing` you are using and regardleff of if you
+are using `zope.testunner` or not.
This is only interesting for people that run tests, which itself run
testrunners (like `z3c.testsetup` itself in self-tests).
@@ -679,10 +680,14 @@
>>> import pkg_resources
>>> info = pkg_resources.get_distribution('zope.testing')
- >>> version = tuple(info.version.split('.'))
- >>> new_version = (version > ('3', '7', '2'))
+ >>> version = info.version.split('.')
+ >>> version = tuple([int(x) for x in version])
+ >>> new_version = (version > (3, 7, 2))
- >>> from zope.testing.testrunner import run
+ >>> try:
+ ... from zope.testing.testrunner import run
+ ... except ImportError:
+ ... from zope.testrunner import run
>>> not new_version or (testrunner.run is not run)
True
Modified: z3c.testsetup/trunk/src/z3c/testsetup/tests/setupininit.txt
===================================================================
--- z3c.testsetup/trunk/src/z3c/testsetup/tests/setupininit.txt 2010-07-24 00:57:19 UTC (rev 114975)
+++ z3c.testsetup/trunk/src/z3c/testsetup/tests/setupininit.txt 2010-07-24 00:58:12 UTC (rev 114976)
@@ -35,11 +35,11 @@
Running z3c.testsetup.functional.doctesting.FunctionalLayer tests:
Set up z3c.testsetup.functional.doctesting.FunctionalLayer in 0.040 seconds.
Ran 2 tests with 0 failures and 0 errors in 0.004 seconds.
- Running zope.testing.testrunner.layer.UnitTests tests:
+ Running zope...testrunner.layer.UnitTests tests:
Tear down z3c.testsetup.functional.doctesting.FunctionalLayer ...
Running in a subprocess.
- Set up zope.testing.testrunner.layer.UnitTests in 0.000 seconds.
+ Set up zope...testrunner.layer.UnitTests in 0.000 seconds.
Ran 2 tests with 0 failures and 0 errors in 0.003 seconds.
- Tear down zope.testing.testrunner.layer.UnitTests in 0.000 seconds.
+ Tear down zope...testrunner.layer.UnitTests in 0.000 seconds.
Total: 4 tests, 0 failures, 0 errors in 1.854 seconds.
False
More information about the checkins
mailing list