Commit 87b10ccb authored by Jim Fulton's avatar Jim Fulton

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.
parent fd0efbb8
......@@ -5,6 +5,7 @@ parts = test oltest py
[py]
recipe = zc.recipe.egg
eggs = zc.buildout
zope.testing
interpreter = py
[test]
......
......@@ -589,6 +589,7 @@ if os.path.exists(bootstrap_py):
>>> 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 @@ if os.path.exists(bootstrap_py):
- buildout
>>> ls(sample_buildout, 'eggs') # doctest: +ELLIPSIS
...
*...
d zc.buildout-1.0-py2.4.egg
"""
......@@ -2880,6 +2881,7 @@ def test_suite():
'-q develop -mxN -d "/sample-buildout/develop-eggs'),
'-q develop -mxN -d /sample-buildout/develop-eggs'
),
(re.compile(r'^[*]...'), '...'),
]),
),
zc.buildout.testselectingpython.test_suite(),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment