Fixed some tests that were failing with a "clean" Python, without

setuptools in site-packages.  For now, the tests should pass whether
or not setuptools is in site-packages.

A better fix would be to control site-packages in the tests, or,
better yet, to change buildout to ignore site-packages.


git-svn-id: http://svn.zope.org/repos/main/zc.buildout/trunk@97819 62d5b8a3-27da-0310-9561-8e5933582275

buildout.cfg

@@ -5,6 +5,7 @@ parts = test oltest py
 [py]
 recipe = zc.recipe.egg
 eggs = zc.buildout
+       zope.testing
 interpreter = py
 
 [test]

src/zc/buildout/tests.py

@@ -589,6 +589,7 @@ if os.path.exists(bootstrap_py):
     >>> write('bootstrap.py', open(bootstrap_py).read())
     >>> print system(zc.buildout.easy_install._safe_arg(sys.executable)+' '+
     ...              'bootstrap.py'), # doctest: +ELLIPSIS
+    *...
     Creating directory '/sample/bin'.
     Creating directory '/sample/parts'.
     Creating directory '/sample/eggs'.
@@ -608,7 +609,7 @@ if os.path.exists(bootstrap_py):
     -  buildout
 
     >>> ls(sample_buildout, 'eggs') # doctest: +ELLIPSIS
-    ...
+    *...
     d  zc.buildout-1.0-py2.4.egg
 
     """
@@ -2880,6 +2881,7 @@ def test_suite():
                    '-q develop -mxN -d "/sample-buildout/develop-eggs'),
                    '-q develop -mxN -d /sample-buildout/develop-eggs'
                 ),
+                (re.compile(r'^[*]...'), '...'),
                ]),
             ),
         zc.buildout.testselectingpython.test_suite(),