[Checkins] SVN: zc.buildout/branches/amos-dependency-links/src/zc/buildout/dependencylinks.txt Fix test so that it passes in Python 2.3, 2.4, and 2.5.

Amos Latteier amos at latteier.com
Mon Oct 29 12:30:36 EDT 2007


Log message for revision 81181:
  Fix test so that it passes in Python 2.3, 2.4, and 2.5.
  

Changed:
  U   zc.buildout/branches/amos-dependency-links/src/zc/buildout/dependencylinks.txt

-=-
Modified: zc.buildout/branches/amos-dependency-links/src/zc/buildout/dependencylinks.txt
===================================================================
--- zc.buildout/branches/amos-dependency-links/src/zc/buildout/dependencylinks.txt	2007-10-29 16:28:51 UTC (rev 81180)
+++ zc.buildout/branches/amos-dependency-links/src/zc/buildout/dependencylinks.txt	2007-10-29 16:30:36 UTC (rev 81181)
@@ -74,11 +74,15 @@
     ...     zip_safe=True, version='1')
     ... ''')
 
-Now we'll remove the existing eggs, and rerunning the buildout to see
-where the egg comes from this time.
+Now we'll remove the existing dependency egg, and rerunning the
+buildout to see where the egg comes from this time.
 
-    >>> remove(sample_buildout, 'eggs', 'demoneeded-1.2c1-py2.4.egg')
-    
+    >>> from glob import glob
+    >>> from os.path import join
+    >>> def remove_demoneeded_egg():
+    ...     for egg in glob(join(sample_buildout, 'eggs', 'demoneeded*.egg')):
+    ...         remove(sample_buildout, 'eggs', egg)
+    >>> remove_demoneeded_egg()
     >>> print system(buildout)
     Develop: '/sample-buildout/depdemo'
     Updating eggs.
@@ -129,7 +133,7 @@
     ...     zip_safe=True, version='1')
     ... '''  % link_server2)
 
-    >>> remove(sample_buildout, 'eggs', 'demoneeded-1.2c1-py2.4.egg')
+    >>> remove_demoneeded_egg()
     >>> print system(buildout) #doctest: +ELLIPSIS
     GET 200 /...
     Develop: '/sample-buildout/depdemo'
@@ -161,7 +165,7 @@
     ... eggs = depdemo
     ... ''' % link_server)
 
-    >>> remove(sample_buildout, 'eggs', 'demoneeded-1.2c1-py2.4.egg')
+    >>> remove_demoneeded_egg()
     >>> print system(buildout)
     Develop: '/sample-buildout/depdemo'
     Updating eggs.
@@ -186,7 +190,7 @@
     ... recipe = zc.recipe.egg:eggs
     ... eggs = depdemo
     ... ''' % link_server)
-    >>> remove(sample_buildout, 'eggs', 'demoneeded-1.2c1-py2.4.egg')
+    >>> remove_demoneeded_egg()
     >>> print system(buildout) #doctest: +ELLIPSIS
     GET 200 /...
     Develop: '/sample-buildout/depdemo'



More information about the Checkins mailing list