Commit c4fecfe2 authored by shane's avatar shane

Fixed broken doctests.

git-svn-id: http://svn.zope.org/repos/main/zc.buildout/trunk@96120 62d5b8a3-27da-0310-9561-8e5933582275
parent 9110a051
...@@ -565,6 +565,8 @@ class Buildout(UserDict.DictMixin): ...@@ -565,6 +565,8 @@ class Buildout(UserDict.DictMixin):
files = glob.glob(setup) files = glob.glob(setup)
if not files: if not files:
self._logger.warn("Couldn't develop %r (not found)", setup) self._logger.warn("Couldn't develop %r (not found)", setup)
else:
files.sort()
for setup in files: for setup in files:
self._logger.info("Develop: %r", setup) self._logger.info("Develop: %r", setup)
__doing__ = 'Processing develop directory %r.', setup __doing__ = 'Processing develop directory %r.', setup
......
...@@ -147,7 +147,7 @@ def find_python(version): ...@@ -147,7 +147,7 @@ def find_python(version):
"Couldn't figure out the executable for Python %(version)s.\n" "Couldn't figure out the executable for Python %(version)s.\n"
"Set the environment variable PYTHON%(version)s to the location\n" "Set the environment variable PYTHON%(version)s to the location\n"
"of the Python %(version)s executable before running the tests." "of the Python %(version)s executable before running the tests."
) % {'version': version})
def buildoutSetUp(test): def buildoutSetUp(test):
......
...@@ -317,7 +317,7 @@ def show_who_requires_when_there_is_a_conflict(): ...@@ -317,7 +317,7 @@ def show_who_requires_when_there_is_a_conflict():
If we use the verbose switch, we can see where requirements are comning from: If we use the verbose switch, we can see where requirements are comning from:
>>> print system(buildout+' -v'), >>> print system(buildout+' -v'), # doctest: +ELLIPSIS
Installing 'zc.buildout', 'setuptools'. Installing 'zc.buildout', 'setuptools'.
We have a develop egg: zc.buildout 1.0.0 We have a develop egg: zc.buildout 1.0.0
We have the best distribution that satisfies 'setuptools'. We have the best distribution that satisfies 'setuptools'.
...@@ -326,9 +326,7 @@ If we use the verbose switch, we can see where requirements are comning from: ...@@ -326,9 +326,7 @@ If we use the verbose switch, we can see where requirements are comning from:
Develop: '/sample-buildout/samplez' Develop: '/sample-buildout/samplez'
Develop: '/sample-buildout/samplea' Develop: '/sample-buildout/samplea'
Develop: '/sample-buildout/sampleb' Develop: '/sample-buildout/sampleb'
Installing 'zc.recipe.egg'. ...Installing eggs.
We have a develop egg: zc.recipe.egg 1.0.0
Installing eggs.
Installing 'samplea', 'samplez'. Installing 'samplea', 'samplez'.
We have a develop egg: samplea 1 We have a develop egg: samplea 1
We have a develop egg: samplez 1 We have a develop egg: samplez 1
...@@ -591,7 +589,10 @@ if os.path.exists(bootstrap_py): ...@@ -591,7 +589,10 @@ if os.path.exists(bootstrap_py):
>>> 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 system(zc.buildout.easy_install._safe_arg(sys.executable)+' '+
... 'bootstrap.py'), # doctest: +ELLIPSIS ... 'bootstrap.py'), # doctest: +ELLIPSIS
Downloading ... Creating directory '/sample/bin'.
Creating directory '/sample/parts'.
Creating directory '/sample/eggs'.
Creating directory '/sample/develop-eggs'.
Generated script '/sample/bin/buildout'. Generated script '/sample/bin/buildout'.
>>> ls(sample_buildout) >>> ls(sample_buildout)
...@@ -606,8 +607,8 @@ if os.path.exists(bootstrap_py): ...@@ -606,8 +607,8 @@ if os.path.exists(bootstrap_py):
>>> ls(sample_buildout, 'bin') >>> ls(sample_buildout, 'bin')
- buildout - buildout
>>> ls(sample_buildout, 'eggs') >>> ls(sample_buildout, 'eggs') # doctest: +ELLIPSIS
- setuptools-0.6-py2.4.egg ...
d zc.buildout-1.0-py2.4.egg d zc.buildout-1.0-py2.4.egg
""" """
...@@ -2024,7 +2025,7 @@ def dealing_with_extremely_insane_dependencies(): ...@@ -2024,7 +2025,7 @@ def dealing_with_extremely_insane_dependencies():
However, if we run in verbose mode, we can see why packages were included: However, if we run in verbose mode, we can see why packages were included:
>>> print system(buildout+' -v'), >>> print system(buildout+' -v'), # doctest: +ELLIPSIS
Installing 'zc.buildout', 'setuptools'. Installing 'zc.buildout', 'setuptools'.
We have a develop egg: zc.buildout 1.0.0 We have a develop egg: zc.buildout 1.0.0
We have the best distribution that satisfies 'setuptools'. We have the best distribution that satisfies 'setuptools'.
...@@ -2034,9 +2035,7 @@ def dealing_with_extremely_insane_dependencies(): ...@@ -2034,9 +2035,7 @@ def dealing_with_extremely_insane_dependencies():
Develop: '/sample-buildout/pack2' Develop: '/sample-buildout/pack2'
Develop: '/sample-buildout/pack3' Develop: '/sample-buildout/pack3'
Develop: '/sample-buildout/pack4' Develop: '/sample-buildout/pack4'
Installing 'zc.recipe.egg'. ...Installing pack1.
We have a develop egg: zc.recipe.egg 1.0.0
Installing pack1.
Installing 'pack0'. Installing 'pack0'.
We have a develop egg: pack0 0.0.0 We have a develop egg: pack0 0.0.0
Getting required 'pack4' Getting required 'pack4'
......
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