[Checkins] SVN: zc.buildout/trunk/ Fixed some tests that were failing with a "clean" Python, without
Jim Fulton
jim at zope.com
Tue Mar 10 17:13:57 EDT 2009
Log message for revision 97819:
Fixed some tests that were failing with a "clean" Python, without
setuptools in site-packages. For now, the tests should pass whether
or not setuptools is in site-packages.
A better fix would be to control site-packages in the tests, or,
better yet, to change buildout to ignore site-packages.
Changed:
U zc.buildout/trunk/buildout.cfg
U zc.buildout/trunk/src/zc/buildout/tests.py
-=-
Modified: zc.buildout/trunk/buildout.cfg
===================================================================
--- zc.buildout/trunk/buildout.cfg 2009-03-10 20:11:13 UTC (rev 97818)
+++ zc.buildout/trunk/buildout.cfg 2009-03-10 21:13:57 UTC (rev 97819)
@@ -5,6 +5,7 @@
[py]
recipe = zc.recipe.egg
eggs = zc.buildout
+ zope.testing
interpreter = py
[test]
Modified: zc.buildout/trunk/src/zc/buildout/tests.py
===================================================================
--- zc.buildout/trunk/src/zc/buildout/tests.py 2009-03-10 20:11:13 UTC (rev 97818)
+++ zc.buildout/trunk/src/zc/buildout/tests.py 2009-03-10 21:13:57 UTC (rev 97819)
@@ -589,6 +589,7 @@
>>> write('bootstrap.py', open(bootstrap_py).read())
>>> print system(zc.buildout.easy_install._safe_arg(sys.executable)+' '+
... 'bootstrap.py'), # doctest: +ELLIPSIS
+ *...
Creating directory '/sample/bin'.
Creating directory '/sample/parts'.
Creating directory '/sample/eggs'.
@@ -608,7 +609,7 @@
- buildout
>>> ls(sample_buildout, 'eggs') # doctest: +ELLIPSIS
- ...
+ *...
d zc.buildout-1.0-py2.4.egg
"""
@@ -2880,6 +2881,7 @@
'-q develop -mxN -d "/sample-buildout/develop-eggs'),
'-q develop -mxN -d /sample-buildout/develop-eggs'
),
+ (re.compile(r'^[*]...'), '...'),
]),
),
zc.buildout.testselectingpython.test_suite(),
More information about the Checkins
mailing list