fix some tests on other Python versions

src/zc/buildout/bootstrap.txt

@@ -232,8 +232,8 @@ Here's the entire help text.
     >>> 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 @@ Here's the entire help text.
     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

src/zc/buildout/tests.py

@@ -3324,6 +3324,8 @@ def test_suite():
                zc.buildout.testing.normalize_script,
                normalize_bang,
                (re.compile('Downloading.*setuptools.*egg\n'), ''),
+               (re.compile('options:'), 'Options:'),
+               (re.compile('usage:'), 'Usage:'),
                ]),
             ))
 

zc.recipe.egg_/src/zc/recipe/egg/selecting-python.txt

@@ -55,8 +55,6 @@ Now, if we run the buildout:
    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 @@ we'll get the Python 2.4 eggs for demo and demoneeded:
     >>> 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