[Checkins] SVN: zc.buildout/branches/help-api/ Fixed some tests that were failing with a "clean" Python, without

[Godefroid Chapelle]

Log message for revision 98557:
  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.

Changed:
  U   zc.buildout/branches/help-api/buildout.cfg
  U   zc.buildout/branches/help-api/src/zc/buildout/tests.py

-=-
Modified: zc.buildout/branches/help-api/buildout.cfg
===================================================================
--- zc.buildout/branches/help-api/buildout.cfg	2009-03-29 21:27:06 UTC (rev 98556)
+++ zc.buildout/branches/help-api/buildout.cfg	2009-03-29 21:27:13 UTC (rev 98557)
@@ -5,6 +5,7 @@
 [py]
 recipe = zc.recipe.egg
 eggs = zc.buildout
+       zope.testing
 interpreter = py
 
 [test]

Modified: zc.buildout/branches/help-api/src/zc/buildout/tests.py
===================================================================
--- zc.buildout/branches/help-api/src/zc/buildout/tests.py	2009-03-29 21:27:06 UTC (rev 98556)
+++ zc.buildout/branches/help-api/src/zc/buildout/tests.py	2009-03-29 21:27:13 UTC (rev 98557)
@@ -589,6 +589,7 @@
     >>> 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 @@
     -  buildout
 
     >>> ls(sample_buildout, 'eggs') # doctest: +ELLIPSIS
-    ...
+    *...
     d  zc.buildout-1.0-py2.4.egg
 
     """
@@ -3290,6 +3291,7 @@
                    '-q develop -mxN -d "/sample-buildout/develop-eggs'),
                    '-q develop -mxN -d /sample-buildout/develop-eggs'
                 ),
+                (re.compile(r'^[*]...'), '...'),
                ]),
             ),
         zc.buildout.testselectingpython.test_suite(),