[Checkins] SVN: zc.buildout/trunk/src/zc/buildout/tests.py Fixed test_bootstrap_py to pass whether or not setuptools is installed

Jim Fulton jim at zope.com
Fri Mar 13 13:34:54 EDT 2009


Log message for revision 98040:
  Fixed test_bootstrap_py to pass whether or not setuptools is installed
  in site-packages.
  

Changed:
  U   zc.buildout/trunk/src/zc/buildout/tests.py

-=-
Modified: zc.buildout/trunk/src/zc/buildout/tests.py
===================================================================
--- zc.buildout/trunk/src/zc/buildout/tests.py	2009-03-13 17:20:12 UTC (rev 98039)
+++ zc.buildout/trunk/src/zc/buildout/tests.py	2009-03-13 17:34:54 UTC (rev 98040)
@@ -587,9 +587,10 @@
     ... parts =
     ... ''')
     >>> write('bootstrap.py', open(bootstrap_py).read())
-    >>> print system(zc.buildout.easy_install._safe_arg(sys.executable)+' '+
-    ...              'bootstrap.py'), # doctest: +ELLIPSIS
-    *...
+    >>> print 'X'; print system(
+    ...     zc.buildout.easy_install._safe_arg(sys.executable)+' '+
+    ...     'bootstrap.py'), # doctest: +ELLIPSIS
+    X...
     Creating directory '/sample/bin'.
     Creating directory '/sample/parts'.
     Creating directory '/sample/eggs'.
@@ -608,8 +609,8 @@
     >>> ls(sample_buildout, 'bin')
     -  buildout
 
-    >>> ls(sample_buildout, 'eggs') # doctest: +ELLIPSIS
-    *...
+    >>> print 'X'; ls(sample_buildout, 'eggs') # doctest: +ELLIPSIS
+    X...
     d  zc.buildout-1.0-py2.4.egg
 
     """



More information about the Checkins mailing list