[Checkins] SVN: zc.recipe.testrunner/branches/1.0.4/ fix tests for distribute and python stdlib
Adam Groszer
agroszer at gmail.com
Wed May 5 04:55:09 EDT 2010
Log message for revision 111968:
fix tests for distribute and python stdlib
Changed:
U zc.recipe.testrunner/branches/1.0.4/CHANGES.txt
U zc.recipe.testrunner/branches/1.0.4/buildout.cfg
U zc.recipe.testrunner/branches/1.0.4/src/zc/recipe/testrunner/README.txt
U zc.recipe.testrunner/branches/1.0.4/src/zc/recipe/testrunner/tests.py
-=-
Modified: zc.recipe.testrunner/branches/1.0.4/CHANGES.txt
===================================================================
--- zc.recipe.testrunner/branches/1.0.4/CHANGES.txt 2010-05-05 08:44:39 UTC (rev 111967)
+++ zc.recipe.testrunner/branches/1.0.4/CHANGES.txt 2010-05-05 08:55:09 UTC (rev 111968)
@@ -2,6 +2,11 @@
Change History
**************
+1.0.4 (2010-05-05)
+==================
+
+- fix tests for distribute and python stdlib
+
1.0.3 (2008-09-10)
==================
@@ -52,14 +57,14 @@
- When:
- + the working-directory option was used,
+ + the working-directory option was used,
+ and the test runner needed to restart itself
+ and the test runner was run with a relative path (e.g. bin/test)
then the testrunner could not restart itself successfully because the
relative path in sys.argv[0] was no-longer valid.
- Now we convert sys.argv[0] to an absolute path.
+ Now we convert sys.argv[0] to an absolute path.
1.0.0b4 (2006-10-24)
====================
Modified: zc.recipe.testrunner/branches/1.0.4/buildout.cfg
===================================================================
--- zc.recipe.testrunner/branches/1.0.4/buildout.cfg 2010-05-05 08:44:39 UTC (rev 111967)
+++ zc.recipe.testrunner/branches/1.0.4/buildout.cfg 2010-05-05 08:55:09 UTC (rev 111968)
@@ -1,12 +1,13 @@
[buildout]
parts = test
develop = .
+extends = http://download.zope.org/zope3.4/3.4.0/versions.cfg
versions = versions
[versions]
-zc.recipe.testrunner = 1.0.2
+zc.recipe.testrunner =
zope.testing = 3.4.0
[test]
recipe = zc.recipe.testrunner
-eggs = zc.recipe.testrunner
+eggs = zc.recipe.testrunner
Modified: zc.recipe.testrunner/branches/1.0.4/src/zc/recipe/testrunner/README.txt
===================================================================
--- zc.recipe.testrunner/branches/1.0.4/src/zc/recipe/testrunner/README.txt 2010-05-05 08:44:39 UTC (rev 111967)
+++ zc.recipe.testrunner/branches/1.0.4/src/zc/recipe/testrunner/README.txt 2010-05-05 08:55:09 UTC (rev 111968)
@@ -22,7 +22,7 @@
defaults
The defaults option lets you specify testrunner default
options. These are specified as Python source for an expression
- yielding a list, typically a list literal.
+ yielding a list, typically a list literal.
working-directory
The working-directory option lets to specify a directory where the
@@ -58,7 +58,7 @@
>>> write(sample_buildout, 'demo', 'setup.py',
... """
... from setuptools import setup
- ...
+ ...
... setup(name = "demo")
... """)
@@ -82,7 +82,7 @@
>>> write(sample_buildout, 'demo2', 'setup.py',
... """
... from setuptools import setup
- ...
+ ...
... setup(name = "demo2", install_requires= ['demoneeded'])
... """)
@@ -108,7 +108,7 @@
>>> write(sample_buildout, 'demoneeded', 'setup.py',
... """
... from setuptools import setup
- ...
+ ...
... setup(name = "demoneeded")
... """)
@@ -126,7 +126,7 @@
...
... [testdemo]
... recipe = zc.recipe.testrunner
- ... eggs =
+ ... eggs =
... demo
... demo2
... script = test
@@ -311,14 +311,14 @@
... recipe = zc.recipe.testrunner
... eggs = demo
... extra-paths = /usr/local/zope/lib/python
- ... defaults = ['--tests-pattern', '^f?tests$',
+ ... defaults = ['--tests-pattern', '^f?tests$',
... '-v'
... ]
... """)
>>> print system(os.path.join(sample_buildout, 'bin', 'buildout') + ' -q'),
- >>> cat(sample_buildout, 'bin', 'testdemo')
+ >>> cat(sample_buildout, 'bin', 'testdemo')
#!/usr/local/bin/python2.4
<BLANKLINE>
import sys
@@ -376,8 +376,7 @@
<BLANKLINE>
Failure in test test (demo.tests.DemoTests)
Traceback (most recent call last):
- ...
- raise self.failureException, \
+ ...
AssertionError: '42' != '23'
<BLANKLINE>
<BLANKLINE>
@@ -455,7 +454,7 @@
... recipe = zc.recipe.testrunner
... eggs = demo
... extra-paths = /usr/local/zope/lib/python
- ... defaults = ['--tests-pattern', '^f?tests$',
+ ... defaults = ['--tests-pattern', '^f?tests$',
... '-v'
... ]
... initialization = print 'Hello all you egg-laying pythons!'
@@ -501,7 +500,7 @@
... recipe = zc.recipe.testrunner
... eggs = demo
... extra-paths = /usr/local/zope/lib/python
- ... defaults = ['--tests-pattern', '^f?tests$',
+ ... defaults = ['--tests-pattern', '^f?tests$',
... '-v'
... ]
... initialization = print 'Hello all you egg-laying pythons!'
@@ -535,4 +534,3 @@
]) + [
'--test-path', '/sample-buildout/demo',
])
-
Modified: zc.recipe.testrunner/branches/1.0.4/src/zc/recipe/testrunner/tests.py
===================================================================
--- zc.recipe.testrunner/branches/1.0.4/src/zc/recipe/testrunner/tests.py 2010-05-05 08:44:39 UTC (rev 111967)
+++ zc.recipe.testrunner/branches/1.0.4/src/zc/recipe/testrunner/tests.py 2010-05-05 08:55:09 UTC (rev 111968)
@@ -36,8 +36,13 @@
zc.buildout.testing.normalize_script,
zc.buildout.testing.normalize_egg_py,
(re.compile('#!\S+py\S*'), '#!python'),
+ #kill duration
(re.compile('\d[.]\d+ seconds'), '0.001 seconds'),
+ #kill zope.testing version
(re.compile('zope.testing-[^-]+-'), 'zope.testing-X-'),
+ #change distribute to setuptools:
+ (re.compile('/distribute-'), '/setuptools-'),
+ #kill setuptools version
(re.compile('setuptools-[^-]+-'), 'setuptools-X-'),
])
),
More information about the checkins
mailing list