[Checkins] SVN: zc.recipe.testrunner/trunk/ Now uses zope.testrunner instead of zope.testing.testrunner.
Lennart Regebro
regebro at gmail.com
Fri Apr 30 15:50:56 EDT 2010
Log message for revision 111687:
Now uses zope.testrunner instead of zope.testing.testrunner.
Changed:
U zc.recipe.testrunner/trunk/CHANGES.txt
U zc.recipe.testrunner/trunk/setup.py
U zc.recipe.testrunner/trunk/src/zc/recipe/testrunner/README.txt
U zc.recipe.testrunner/trunk/src/zc/recipe/testrunner/__init__.py
U zc.recipe.testrunner/trunk/src/zc/recipe/testrunner/tests.py
-=-
Modified: zc.recipe.testrunner/trunk/CHANGES.txt
===================================================================
--- zc.recipe.testrunner/trunk/CHANGES.txt 2010-04-30 19:49:17 UTC (rev 111686)
+++ zc.recipe.testrunner/trunk/CHANGES.txt 2010-04-30 19:50:56 UTC (rev 111687)
@@ -2,7 +2,7 @@
Change History
**************
-x.y.z (Unreleased)
+1.3.0 (Unreleased)
==================
- Updated tests to run with the last versions of all modules.
@@ -10,6 +10,8 @@
- Removed the usage of the deprecated zope.testing.doctest, therby also
dropping Python 2.3 support.
+- Started using zope.testrunner instead of zope.testing.testrunner.
+
1.2.0 (2009-03-23)
==================
Modified: zc.recipe.testrunner/trunk/setup.py
===================================================================
--- zc.recipe.testrunner/trunk/setup.py 2010-04-30 19:49:17 UTC (rev 111686)
+++ zc.recipe.testrunner/trunk/setup.py 2010-04-30 19:50:56 UTC (rev 111687)
@@ -7,7 +7,7 @@
name = "zc.recipe.testrunner"
setup(
name = name,
- version = "1.2.1dev",
+ version = "1.3.0dev",
author = "Jim Fulton",
author_email = "jim at zope.com",
description = "ZC Buildout recipe for creating test runners",
@@ -30,7 +30,7 @@
package_dir = {'':'src'},
namespace_packages = ['zc', 'zc.recipe'],
install_requires = ['zc.buildout >=1.2.0',
- 'zope.testing >=3.6.0',
+ 'zope.testrunner',
'setuptools',
'zc.recipe.egg >=1.2.0',
],
Modified: zc.recipe.testrunner/trunk/src/zc/recipe/testrunner/README.txt
===================================================================
--- zc.recipe.testrunner/trunk/src/zc/recipe/testrunner/README.txt 2010-04-30 19:49:17 UTC (rev 111686)
+++ zc.recipe.testrunner/trunk/src/zc/recipe/testrunner/README.txt 2010-04-30 19:50:56 UTC (rev 111687)
@@ -175,14 +175,14 @@
>>> print system(os.path.join(sample_buildout, 'bin', 'test') + ' -vv'),
Running tests at level 1
- Running zope.testing.testrunner.layer.UnitTests tests:
- Set up zope.testing.testrunner.layer.UnitTests in 0.001 seconds.
+ Running zope.testrunner.layer.UnitTests tests:
+ Set up zope.testrunner.layer.UnitTests in 0.001 seconds.
Running:
test (demo.tests.TestDemo)
test2 (demo2.tests.Demo2Tests)
Ran 2 tests with 0 failures and 0 errors in 0.000 seconds.
Tearing down left over layers:
- Tear down zope.testing.testrunner.layer.UnitTests in 0.001 seconds.
+ Tear down zope.testrunner.layer.UnitTests in 0.001 seconds.
Note that we didn't run the demoneeded tests. Tests are only run for
the eggs listed, not for their dependencies.
@@ -211,11 +211,11 @@
We can run the test script to run our demo test:
>>> print system(os.path.join(sample_buildout, 'bin', 'testdemo') + ' -q'),
- Running zope.testing.testrunner.layer.UnitTests tests:
- Set up zope.testing.testrunner.layer.UnitTests in 0.001 seconds.
+ Running zope.testrunner.layer.UnitTests tests:
+ Set up zope.testrunner.layer.UnitTests in 0.001 seconds.
Ran 1 tests with 0 failures and 0 errors in 0.001 seconds.
Tearing down left over layers:
- Tear down zope.testing.testrunner.layer.UnitTests in 0.001 seconds.
+ Tear down zope.testrunner.layer.UnitTests in 0.001 seconds.
If we need to include other paths in our test script, we can use the
extra-paths option to specify them:
@@ -241,7 +241,7 @@
import sys
sys.path[0:0] = [
'/sample-buildout/demo',
- '/sample-buildout/eggs/zope.testing-3.0-py2.3.egg',
+ '/sample-buildout/eggs/zope.testrunner-4.0-py2.3.egg',
'/sample-buildout/eggs/zope.interface-3.4.1-py2.4.egg',
'/sample-buildout/eggs/zope.exceptions-3.5.2-py2.4.egg',
'/sample-buildout/eggs/setuptools-0.6-py1.3.egg',
@@ -253,10 +253,10 @@
os.chdir('/sample-buildout/parts/testdemo')
<BLANKLINE>
<BLANKLINE>
- import zope.testing.testrunner
+ import zope.testrunner
<BLANKLINE>
if __name__ == '__main__':
- zope.testing.testrunner.run([
+ zope.testrunner.run([
'--test-path', '/sample-buildout/demo',
])
@@ -285,7 +285,7 @@
import sys
sys.path[0:0] = [
'/sample-buildout/demo',
- '/sample-buildout/eggs/zope.testing-3.0-py2.3.egg',
+ '/sample-buildout/eggs/zope.testrunner-4.0-py2.3.egg',
'/sample-buildout/eggs/zope.interface-3.4.1-py2.4.egg',
'/sample-buildout/eggs/zope.exceptions-3.5.2-py2.4.egg',
'/sample-buildout/eggs/setuptools-0.6-py1.3.egg',
@@ -297,10 +297,10 @@
os.chdir('/foo/bar')
<BLANKLINE>
<BLANKLINE>
- import zope.testing.testrunner
+ import zope.testrunner
<BLANKLINE>
if __name__ == '__main__':
- zope.testing.testrunner.run([
+ zope.testrunner.run([
'--test-path', '/sample-buildout/demo',
])
@@ -341,7 +341,7 @@
import sys
sys.path[0:0] = [
'/sample-buildout/demo',
- '/sample-buildout/eggs/zope.testing-3.0-py2.4.egg',
+ '/sample-buildout/eggs/zope.testrunner-4.0-py2.3.egg',
'/sample-buildout/eggs/zope.interface-3.4.1-py2.4.egg',
'/sample-buildout/eggs/zope.exceptions-3.5.2-py2.4.egg',
'/sample-buildout/eggs/setuptools-0.6-py1.3.egg',
@@ -353,10 +353,10 @@
os.chdir('/sample-buildout/parts/testdemo')
<BLANKLINE>
<BLANKLINE>
- import zope.testing.testrunner
+ import zope.testrunner
<BLANKLINE>
if __name__ == '__main__':
- zope.testing.testrunner.run((['--tests-pattern', '^f?tests$',
+ zope.testrunner.run((['--tests-pattern', '^f?tests$',
'-v'
]) + [
'--test-path', '/sample-buildout/demo',
@@ -389,8 +389,8 @@
>>> print system(os.path.join(sample_buildout, 'bin', 'testdemo') + ' -vv'), # doctest: +ELLIPSIS
Running tests at level 1
- Running zope.testing.testrunner.layer.UnitTests tests:
- Set up zope.testing.testrunner.layer.UnitTests in 0.001 seconds.
+ Running zope.testrunner.layer.UnitTests tests:
+ Set up zope.testrunner.layer.UnitTests in 0.001 seconds.
Running:
test (demo.tests.DemoTests) (0.000 s)
<BLANKLINE>
@@ -403,7 +403,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 0.001 seconds.
+ Tear down zope.testrunner.layer.UnitTests in 0.001 seconds.
<BLANKLINE>
Tests with failures:
test (demo.tests.DemoTests)
@@ -439,7 +439,7 @@
import sys
sys.path[0:0] = [
'/sample-buildout/demo',
- '/sample-buildout/eggs/zope.testing-3.0-py2.3.egg',
+ '/sample-buildout/eggs/zope.testrunner-4.0-py2.3.egg',
'/sample-buildout/eggs/zope.interface-3.4.1-py2.4.egg',
'/sample-buildout/eggs/zope.exceptions-3.5.2-py2.4.egg',
'/sample-buildout/eggs/setuptools-0.6-py1.3.egg',
@@ -451,22 +451,22 @@
os.environ['zc.recipe.testrunner'] = '42'
<BLANKLINE>
<BLANKLINE>
- import zope.testing.testrunner
+ import zope.testrunner
<BLANKLINE>
if __name__ == '__main__':
- zope.testing.testrunner.run([
+ zope.testrunner.run([
'--test-path', '/sample-buildout/demo',
])
>>> print system(os.path.join(sample_buildout, 'bin', 'testdemo') + ' -vv'),
Running tests at level 1
- Running zope.testing.testrunner.layer.UnitTests tests:
- Set up zope.testing.testrunner.layer.UnitTests in 0.001 seconds.
+ Running zope.testrunner.layer.UnitTests tests:
+ Set up zope.testrunner.layer.UnitTests in 0.001 seconds.
Running:
test (demo.tests.DemoTests)
Ran 1 tests with 0 failures and 0 errors in 0.001 seconds.
Tearing down left over layers:
- Tear down zope.testing.testrunner.layer.UnitTests in 0.001 seconds.
+ Tear down zope.testrunner.layer.UnitTests in 0.001 seconds.
One can add initialization steps in the buildout. These will be added to the
end of the script:
@@ -496,7 +496,7 @@
import sys
sys.path[0:0] = [
'/sample-buildout/demo',
- '/sample-buildout/eggs/zope.testing-3.0-py2.3.egg',
+ '/sample-buildout/eggs/zope.testrunner-4.0-py2.3.egg',
'/sample-buildout/eggs/zope.interface-3.4.1-py2.4.egg',
'/sample-buildout/eggs/zope.exceptions-3.5.2-py2.4.egg',
'/sample-buildout/eggs/setuptools-0.6-py1.3.egg',
@@ -508,10 +508,10 @@
os.chdir('/sample-buildout/parts/testdemo')
print 'Hello all you egg-laying pythons!'
<BLANKLINE>
- import zope.testing.testrunner
+ import zope.testrunner
<BLANKLINE>
if __name__ == '__main__':
- zope.testing.testrunner.run((['--tests-pattern', '^f?tests$',
+ zope.testrunner.run((['--tests-pattern', '^f?tests$',
'-v'
]) + [
'--test-path', '/sample-buildout/demo',
@@ -545,7 +545,7 @@
import sys
sys.path[0:0] = [
'/sample-buildout/demo',
- '/sample-buildout/eggs/zope.testing-3.0-py2.3.egg',
+ '/sample-buildout/eggs/zope.testrunner-4.0-py2.3.egg',
'/sample-buildout/eggs/zope.interface-3.4.1-py2.4.egg',
'/sample-buildout/eggs/zope.exceptions-3.5.2-py2.4.egg',
'/sample-buildout/eggs/setuptools-0.6-py1.3.egg',
@@ -558,10 +558,10 @@
print 'Hello all you egg-laying pythons!'
print 'I thought pythons were live bearers?'
<BLANKLINE>
- import zope.testing.testrunner
+ import zope.testrunner
<BLANKLINE>
if __name__ == '__main__':
- zope.testing.testrunner.run((['--tests-pattern', '^f?tests$',
+ zope.testrunner.run((['--tests-pattern', '^f?tests$',
'-v'
]) + [
'--test-path', '/sample-buildout/demo',
@@ -599,7 +599,7 @@
import sys
sys.path[0:0] = [
join(base, 'demo'),
- join(base, 'eggs/zope.testing-3.7.1-py2.4.egg'),
+ join(base, 'eggs/zope.testrunner-4.0.0-py2.4.egg'),
join(base, 'eggs/zope.interface-3.5.1-py2.4-linux-i686.egg'),
join(base, 'eggs/zope.exceptions-3.5.2-linux-i686.egg'),
join(base, 'eggs/setuptools-0.6c9-py2.4.egg'),
@@ -612,10 +612,10 @@
os.chdir(join(base, 'parts/testdemo'))
<BLANKLINE>
<BLANKLINE>
- import zope.testing.testrunner
+ import zope.testrunner
<BLANKLINE>
if __name__ == '__main__':
- zope.testing.testrunner.run([
+ zope.testrunner.run([
'--test-path', join(base, 'demo'),
])
@@ -650,7 +650,7 @@
import sys
sys.path[0:0] = [
join(base, 'demo'),
- join(base, 'eggs/zope.testing-3.7.1-py2.4.egg'),
+ join(base, 'eggs/zope.testrunner-4.0.0-py2.4.egg'),
join(base, 'eggs/zope.interface-3.5.1-py2.4-linux-i686.egg'),
join(base, 'eggs/zope.exceptions-3.5.2-linux-i686.egg'),
join(base, 'eggs/setuptools-0.6c9-py2.4.egg'),
@@ -663,10 +663,10 @@
os.chdir(join(base, 'parts/testdemo'))
<BLANKLINE>
<BLANKLINE>
- import zope.testing.testrunner
+ import zope.testrunner
<BLANKLINE>
if __name__ == '__main__':
- zope.testing.testrunner.run([
+ zope.testrunner.run([
'--test-path', join(base, 'demo'),
])
Modified: zc.recipe.testrunner/trunk/src/zc/recipe/testrunner/__init__.py
===================================================================
--- zc.recipe.testrunner/trunk/src/zc/recipe/testrunner/__init__.py 2010-04-30 19:49:17 UTC (rev 111686)
+++ zc.recipe.testrunner/trunk/src/zc/recipe/testrunner/__init__.py 2010-04-30 19:50:56 UTC (rev 111687)
@@ -40,7 +40,7 @@
def install(self):
options = self.options
dest = []
- eggs, ws = self.egg.working_set(('zope.testing', ))
+ eggs, ws = self.egg.working_set(('zope.testrunner', ))
test_paths = [ws.find(pkg_resources.Requirement.parse(spec)).location
for spec in eggs]
@@ -80,7 +80,7 @@
initialization += initialization_section
dest.extend(zc.buildout.easy_install.scripts(
- [(options['script'], 'zope.testing.testrunner', 'run')],
+ [(options['script'], 'zope.testrunner', 'run')],
ws, options['executable'],
self.buildout['buildout']['bin-directory'],
extra_paths=self.egg.extra_paths,
Modified: zc.recipe.testrunner/trunk/src/zc/recipe/testrunner/tests.py
===================================================================
--- zc.recipe.testrunner/trunk/src/zc/recipe/testrunner/tests.py 2010-04-30 19:49:17 UTC (rev 111686)
+++ zc.recipe.testrunner/trunk/src/zc/recipe/testrunner/tests.py 2010-04-30 19:50:56 UTC (rev 111687)
@@ -26,6 +26,7 @@
zc.buildout.testing.install_develop('zc.recipe.testrunner', test)
zc.buildout.testing.install_develop('zc.recipe.egg', test)
zc.buildout.testing.install('zope.testing', test)
+ zc.buildout.testing.install('zope.testrunner', test)
zc.buildout.testing.install('zope.interface', test)
zc.buildout.testing.install('zope.exceptions', test)
@@ -42,6 +43,7 @@
(re.compile('#!\S+py\S*'), '#!python'),
(re.compile('\d[.]\d+ seconds'), '0.001 seconds'),
(re.compile('zope.testing-[^-]+-'), 'zope.testing-X-'),
+ (re.compile('zope.testrunner-[^-]+-'), 'zope.testrunner-X-'),
(re.compile('setuptools-[^-]+-'), 'setuptools-X-'),
(re.compile('distribute-[^-]+-'), 'setuptools-X-'),
(re.compile('zope.interface-[^-]+-'), 'zope.interface-X-'),
More information about the checkins
mailing list