Commit b48f820a authored by Jim Fulton's avatar Jim Fulton

Fixed test_bootstrap_py to pass whether or not setuptools is installed

in site-packages.
parent 043a0828
...@@ -587,9 +587,10 @@ if os.path.exists(bootstrap_py): ...@@ -587,9 +587,10 @@ if os.path.exists(bootstrap_py):
... parts = ... parts =
... ''') ... ''')
>>> write('bootstrap.py', open(bootstrap_py).read()) >>> write('bootstrap.py', open(bootstrap_py).read())
>>> print system(zc.buildout.easy_install._safe_arg(sys.executable)+' '+ >>> print 'X'; print system(
... 'bootstrap.py'), # doctest: +ELLIPSIS ... zc.buildout.easy_install._safe_arg(sys.executable)+' '+
*... ... 'bootstrap.py'), # doctest: +ELLIPSIS
X...
Creating directory '/sample/bin'. Creating directory '/sample/bin'.
Creating directory '/sample/parts'. Creating directory '/sample/parts'.
Creating directory '/sample/eggs'. Creating directory '/sample/eggs'.
...@@ -608,8 +609,8 @@ if os.path.exists(bootstrap_py): ...@@ -608,8 +609,8 @@ if os.path.exists(bootstrap_py):
>>> ls(sample_buildout, 'bin') >>> ls(sample_buildout, 'bin')
- buildout - buildout
>>> ls(sample_buildout, 'eggs') # doctest: +ELLIPSIS >>> print 'X'; ls(sample_buildout, 'eggs') # doctest: +ELLIPSIS
*... X...
d zc.buildout-1.0-py2.4.egg d zc.buildout-1.0-py2.4.egg
""" """
......
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