[Checkins] SVN: zc.buildout/trunk/src/zc/buildout/ Fixed broken doctests.

[Shane Hathaway]

Log message for revision 96120:
  Fixed broken doctests.
  

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

-=-
Modified: zc.buildout/trunk/src/zc/buildout/buildout.py
===================================================================
--- zc.buildout/trunk/src/zc/buildout/buildout.py	2009-02-05 01:52:35 UTC (rev 96119)
+++ zc.buildout/trunk/src/zc/buildout/buildout.py	2009-02-05 02:45:22 UTC (rev 96120)
@@ -565,6 +565,8 @@
                     files = glob.glob(setup)
                     if not files:
                         self._logger.warn("Couldn't develop %r (not found)", setup)
+                    else:
+                        files.sort()
                     for setup in files:
                         self._logger.info("Develop: %r", setup)
                         __doing__ = 'Processing develop directory %r.', setup

Modified: zc.buildout/trunk/src/zc/buildout/testing.py
===================================================================
--- zc.buildout/trunk/src/zc/buildout/testing.py	2009-02-05 01:52:35 UTC (rev 96119)
+++ zc.buildout/trunk/src/zc/buildout/testing.py	2009-02-05 02:45:22 UTC (rev 96120)
@@ -147,7 +147,7 @@
         "Couldn't figure out the executable for Python %(version)s.\n"
         "Set the environment variable PYTHON%(version)s to the location\n"
         "of the Python %(version)s executable before running the tests."
-        )
+        % {'version': version})
 
 def buildoutSetUp(test):
 

Modified: zc.buildout/trunk/src/zc/buildout/tests.py
===================================================================
--- zc.buildout/trunk/src/zc/buildout/tests.py	2009-02-05 01:52:35 UTC (rev 96119)
+++ zc.buildout/trunk/src/zc/buildout/tests.py	2009-02-05 02:45:22 UTC (rev 96120)
@@ -317,7 +317,7 @@
 
 If we use the verbose switch, we can see where requirements are comning from:
 
-    >>> print system(buildout+' -v'),
+    >>> print system(buildout+' -v'), # doctest: +ELLIPSIS
     Installing 'zc.buildout', 'setuptools'.
     We have a develop egg: zc.buildout 1.0.0
     We have the best distribution that satisfies 'setuptools'.
@@ -326,9 +326,7 @@
     Develop: '/sample-buildout/samplez'
     Develop: '/sample-buildout/samplea'
     Develop: '/sample-buildout/sampleb'
-    Installing 'zc.recipe.egg'.
-    We have a develop egg: zc.recipe.egg 1.0.0
-    Installing eggs.
+    ...Installing eggs.
     Installing 'samplea', 'samplez'.
     We have a develop egg: samplea 1
     We have a develop egg: samplez 1
@@ -591,7 +589,10 @@
     >>> write('bootstrap.py', open(bootstrap_py).read())
     >>> print system(zc.buildout.easy_install._safe_arg(sys.executable)+' '+
     ...              'bootstrap.py'), # doctest: +ELLIPSIS
-    Downloading ...
+    Creating directory '/sample/bin'.
+    Creating directory '/sample/parts'.
+    Creating directory '/sample/eggs'.
+    Creating directory '/sample/develop-eggs'.
     Generated script '/sample/bin/buildout'.
 
     >>> ls(sample_buildout)
@@ -606,8 +607,8 @@
     >>> ls(sample_buildout, 'bin')
     -  buildout
 
-    >>> ls(sample_buildout, 'eggs')
-    -  setuptools-0.6-py2.4.egg
+    >>> ls(sample_buildout, 'eggs') # doctest: +ELLIPSIS
+    ...
     d  zc.buildout-1.0-py2.4.egg
 
     """
@@ -2024,7 +2025,7 @@
 
     However, if we run in verbose mode, we can see why packages were included:
 
-    >>> print system(buildout+' -v'),
+    >>> print system(buildout+' -v'), # doctest: +ELLIPSIS
     Installing 'zc.buildout', 'setuptools'.
     We have a develop egg: zc.buildout 1.0.0
     We have the best distribution that satisfies 'setuptools'.
@@ -2034,9 +2035,7 @@
     Develop: '/sample-buildout/pack2'
     Develop: '/sample-buildout/pack3'
     Develop: '/sample-buildout/pack4'
-    Installing 'zc.recipe.egg'.
-    We have a develop egg: zc.recipe.egg 1.0.0
-    Installing pack1.
+    ...Installing pack1.
     Installing 'pack0'.
     We have a develop egg: pack0 0.0.0
     Getting required 'pack4'