[Checkins] SVN: zc.buildout/branches/gary-1-minor-cleanup/src/zc/buildout/ get tests passing after the cleanup. this branch should be done, afaik.
Gary Poster
gary.poster at canonical.com
Thu Sep 24 15:07:37 EDT 2009
Log message for revision 104508:
get tests passing after the cleanup. this branch should be done, afaik.
Changed:
U zc.buildout/branches/gary-1-minor-cleanup/src/zc/buildout/buildout.txt
U zc.buildout/branches/gary-1-minor-cleanup/src/zc/buildout/setup.txt
-=-
Modified: zc.buildout/branches/gary-1-minor-cleanup/src/zc/buildout/buildout.txt
===================================================================
--- zc.buildout/branches/gary-1-minor-cleanup/src/zc/buildout/buildout.txt 2009-09-24 18:46:07 UTC (rev 104507)
+++ zc.buildout/branches/gary-1-minor-cleanup/src/zc/buildout/buildout.txt 2009-09-24 19:07:37 UTC (rev 104508)
@@ -716,7 +716,8 @@
the origin of the value (file name or COMPUTED_VALUE, DEFAULT_VALUE,
COMMAND_LINE_VALUE).
- >>> print system(buildout+ ' annotate'), # doctest: +ELLIPSIS
+ >>> print system(buildout+ ' annotate'),
+ ... # doctest: +ELLIPSIS +NORMALIZE_WHITESPACE
<BLANKLINE>
Annotated sections
==================
@@ -1156,7 +1157,7 @@
operations.
>>> print system(os.path.join('bin', 'buildout') + ' annotate'),
- ... # doctest: +ELLIPSIS
+ ... # doctest: +ELLIPSIS +NORMALIZE_WHITESPACE
<BLANKLINE>
Annotated sections
==================
@@ -1191,7 +1192,6 @@
[part4]
option= h1 h2
/sample-buildout/extension1.cfg
- ...
Cleanup.
@@ -1902,6 +1902,7 @@
d recipes
>>> cat(sample_buildout, '.installed.cfg')
+ ... # doctest: +NORMALIZE_WHITESPACE
[buildout]
installed_develop_eggs = /sample-buildout/develop-eggs/recipes.egg-link
parts = debug d1 d2 d3
@@ -1987,6 +1988,7 @@
The .installed.cfg is only updated for the recipes that ran:
>>> cat(sample_buildout, '.installed.cfg')
+ ... # doctest: +NORMALIZE_WHITESPACE
[buildout]
installed_develop_eggs = /sample-buildout/develop-eggs/recipes.egg-link
parts = debug d1 d2 d3 d4
@@ -2510,8 +2512,7 @@
d recipes
-Note that there will be no installation database if there are no
-parts:
+Note that there will be no installation database if there are no parts:
>>> write('buildout.cfg',
... """
Modified: zc.buildout/branches/gary-1-minor-cleanup/src/zc/buildout/setup.txt
===================================================================
--- zc.buildout/branches/gary-1-minor-cleanup/src/zc/buildout/setup.txt 2009-09-24 18:46:07 UTC (rev 104507)
+++ zc.buildout/branches/gary-1-minor-cleanup/src/zc/buildout/setup.txt 2009-09-24 19:07:37 UTC (rev 104508)
@@ -29,12 +29,14 @@
We'll use the buildout script from our sample buildout:
>>> print system(buildout+' setup'),
- Error: The setup command requires the path to a setup script or
- directory containing a setup script, and it's arguments.
+ ... # doctest: +NORMALIZE_WHITESPACE
+ Error: The setup command requires the path to a setup script or
+ directory containing a setup script, and its arguments.
Oops, we forgot to give the name of the setup script:
- >>> print system(buildout+' setup setup.py bdist_egg'), # doctest: +ELLIPSIS
+ >>> print system(buildout+' setup setup.py bdist_egg'),
+ ... # doctest: +ELLIPSIS
Running setup script 'setup.py'.
...
More information about the checkins
mailing list