[Checkins] SVN: zc.buildout/branches/gary-4/ fix some tests on other Python versions
Gary Poster
gary.poster at canonical.com
Fri Feb 12 19:39:21 EST 2010
Log message for revision 108966:
fix some tests on other Python versions
Changed:
U zc.buildout/branches/gary-4/src/zc/buildout/bootstrap.txt
U zc.buildout/branches/gary-4/src/zc/buildout/tests.py
U zc.buildout/branches/gary-4/zc.recipe.egg_/src/zc/recipe/egg/selecting-python.txt
-=-
Modified: zc.buildout/branches/gary-4/src/zc/buildout/bootstrap.txt
===================================================================
--- zc.buildout/branches/gary-4/src/zc/buildout/bootstrap.txt 2010-02-13 00:38:56 UTC (rev 108965)
+++ zc.buildout/branches/gary-4/src/zc/buildout/bootstrap.txt 2010-02-13 00:39:20 UTC (rev 108966)
@@ -232,8 +232,8 @@
>>> print system(
... zc.buildout.easy_install._safe_arg(sys.executable)+' '+
... 'bootstrap.py --help'),
- ... # doctest: +ELLIPSIS
- usage: [DESIRED PYTHON FOR BUILDOUT] bootstrap.py [options]
+ ... # doctest: +ELLIPSIS +NORMALIZE_WHITESPACE
+ Usage: [DESIRED PYTHON FOR BUILDOUT] bootstrap.py [options]
<BLANKLINE>
Bootstraps a buildout-based project.
<BLANKLINE>
@@ -244,7 +244,7 @@
local resources, you can keep this script from going over the network.
<BLANKLINE>
<BLANKLINE>
- options:
+ Options:
-h, --help show this help message and exit
-v VERSION, --version=VERSION
use a specific zc.buildout version
Modified: zc.buildout/branches/gary-4/src/zc/buildout/tests.py
===================================================================
--- zc.buildout/branches/gary-4/src/zc/buildout/tests.py 2010-02-13 00:38:56 UTC (rev 108965)
+++ zc.buildout/branches/gary-4/src/zc/buildout/tests.py 2010-02-13 00:39:20 UTC (rev 108966)
@@ -3324,6 +3324,8 @@
zc.buildout.testing.normalize_script,
normalize_bang,
(re.compile('Downloading.*setuptools.*egg\n'), ''),
+ (re.compile('options:'), 'Options:'),
+ (re.compile('usage:'), 'Usage:'),
]),
))
Modified: zc.buildout/branches/gary-4/zc.recipe.egg_/src/zc/recipe/egg/selecting-python.txt
===================================================================
--- zc.buildout/branches/gary-4/zc.recipe.egg_/src/zc/recipe/egg/selecting-python.txt 2010-02-13 00:38:56 UTC (rev 108965)
+++ zc.buildout/branches/gary-4/zc.recipe.egg_/src/zc/recipe/egg/selecting-python.txt 2010-02-13 00:39:20 UTC (rev 108966)
@@ -55,8 +55,6 @@
Getting distribution for 'demo<0.3'.
Got demo 0.2.
Getting distribution for 'demoneeded'.
- Getting distribution for 'setuptools'.
- Got setuptools 0.6.
Got demoneeded 1.2c1.
Generated script '/sample-buildout/bin/demo'.
Generated interpreter '/sample-buildout/bin/py-demo'.
@@ -66,7 +64,6 @@
>>> ls(sample_buildout, 'eggs')
- demo-0.2-py2.4.egg
- demoneeded-1.2c1-py2.4.egg
- d setuptools-0.6-py2.4.egg
d setuptools-0.6-py2.5.egg
- zc.buildout-1.0-py2.5.egg
More information about the checkins
mailing list