[Checkins] SVN: zc.recipe.cmmi/branches/patricks-buildout1.5/s tests pass with buildout 1.4 and 1.5

[Patrick Strawderman]

Log message for revision 119243:
  tests pass with buildout 1.4 and 1.5

Changed:
  U   zc.recipe.cmmi/branches/patricks-buildout1.5/setup.py
  U   zc.recipe.cmmi/branches/patricks-buildout1.5/src/zc/recipe/cmmi/README.txt
  U   zc.recipe.cmmi/branches/patricks-buildout1.5/src/zc/recipe/cmmi/downloadcache.txt
  U   zc.recipe.cmmi/branches/patricks-buildout1.5/src/zc/recipe/cmmi/misc.txt
  U   zc.recipe.cmmi/branches/patricks-buildout1.5/src/zc/recipe/cmmi/tests.py

-=-
Modified: zc.recipe.cmmi/branches/patricks-buildout1.5/setup.py
===================================================================
--- zc.recipe.cmmi/branches/patricks-buildout1.5/setup.py	2010-12-31 18:31:14 UTC (rev 119242)
+++ zc.recipe.cmmi/branches/patricks-buildout1.5/setup.py	2010-12-31 18:34:27 UTC (rev 119243)
@@ -60,7 +60,7 @@
     include_package_data = True,
     data_files = [('.', ['README.txt'])],
     namespace_packages = ['zc', 'zc.recipe'],
-    install_requires = ['zc.buildout >=1.4, <1.5.0b1', 'setuptools'],
+    install_requires = ['zc.buildout >=1.4', 'setuptools'],
     extras_require = dict(test=['zope.testing']),
     entry_points = {'zc.buildout':
                     ['default = %s:Recipe' % name]},

Modified: zc.recipe.cmmi/branches/patricks-buildout1.5/src/zc/recipe/cmmi/README.txt
===================================================================
--- zc.recipe.cmmi/branches/patricks-buildout1.5/src/zc/recipe/cmmi/README.txt	2010-12-31 18:31:14 UTC (rev 119242)
+++ zc.recipe.cmmi/branches/patricks-buildout1.5/src/zc/recipe/cmmi/README.txt	2010-12-31 18:34:27 UTC (rev 119243)
@@ -37,9 +37,11 @@
 
 The recipe also creates the parts directory:
 
-    >>> ls(sample_buildout, 'parts')
-    d  foo
+    >>> import os.path
 
+    >>> os.path.isdir(join(sample_buildout, "parts", "foo"))
+    True
+
 If we run the buildout again, the update method will be called, which
 does nothing:
 
@@ -325,7 +327,7 @@
     While:
       Installing foo.
     <BLANKLINE>
-    An internal error occured due to a bug in either zc.buildout or in a
+    An internal error occurred due to a bug in either zc.buildout or in a
     recipe being used:
     ...
     SystemError: ('Failed', 'patch -p0 < /.../patches/config.patch')

Modified: zc.recipe.cmmi/branches/patricks-buildout1.5/src/zc/recipe/cmmi/downloadcache.txt
===================================================================
--- zc.recipe.cmmi/branches/patricks-buildout1.5/src/zc/recipe/cmmi/downloadcache.txt	2010-12-31 18:31:14 UTC (rev 119242)
+++ zc.recipe.cmmi/branches/patricks-buildout1.5/src/zc/recipe/cmmi/downloadcache.txt	2010-12-31 18:34:27 UTC (rev 119243)
@@ -76,10 +76,12 @@
 If we remove the installed parts and then re-run, we'll see that the
 files are not downloaded afresh:
 
-    >>> import os
-    >>> for f in os.listdir('parts'):
-    ...     remove('parts', f)
-   
+    >>> def remove_parts():
+    ...     for f in os.listdir("parts"):
+    ...         if f != "buildout":
+    ...             remove("parts", f)
+    >>> remove_parts()
+
     >>> print system(buildout)
     In...
     ...
@@ -103,8 +105,7 @@
     >>> for f in os.listdir( cache_path ):
     ...   remove (cache_path, f)
 
-    >>> for f in os.listdir('parts'):
-    ...     remove('parts', f)
+    >>> remove_parts()
 
     >>> print system('bin/buildout')
     In...
@@ -123,8 +124,7 @@
 If the cache location is changed, and the installed parts are removed,
 the new cache is created and repopulated:
 
-    >>> for f in os.listdir('parts'):
-    ...     remove('parts', f)
+    >>> remove_parts()
 
     >>> cache2 = tmpdir('cache2')
     >>> write('buildout.cfg',
@@ -186,8 +186,7 @@
     ... url = %s/foo.tgz
     ... """ % (cache, distros))
 
-    >>> for f in os.listdir('parts'):
-    ...     remove('parts', f)
+    >>> remove_parts()
 
     >>> print system(buildout)
     In...
@@ -210,8 +209,7 @@
     >>> for f in os.listdir( cache_path ):
     ...   remove (cache_path, f)
 
-    >>> for f in os.listdir('parts'):
-    ...     remove('parts', f)
+    >>> remove_parts()
 
     >>> print system(buildout)
     In...

Modified: zc.recipe.cmmi/branches/patricks-buildout1.5/src/zc/recipe/cmmi/misc.txt
===================================================================
--- zc.recipe.cmmi/branches/patricks-buildout1.5/src/zc/recipe/cmmi/misc.txt	2010-12-31 18:31:14 UTC (rev 119242)
+++ zc.recipe.cmmi/branches/patricks-buildout1.5/src/zc/recipe/cmmi/misc.txt	2010-12-31 18:34:27 UTC (rev 119243)
@@ -27,12 +27,12 @@
     ... url = file://%s/foo.tgz
     ... """ % (distros))
 
-    >>> print system('bin/buildout') 
+    >>> print system('bin/buildout')
     Installing...
     ...
     installing foo
     <BLANKLINE>
-    
-    >>> ls(join(sample_buildout, 'parts'))
-    d  foo
 
+    >>> import os.path
+    >>> os.path.isdir(join(sample_buildout, "parts", "foo"))
+    True

Modified: zc.recipe.cmmi/branches/patricks-buildout1.5/src/zc/recipe/cmmi/tests.py
===================================================================
--- zc.recipe.cmmi/branches/patricks-buildout1.5/src/zc/recipe/cmmi/tests.py	2010-12-31 18:31:14 UTC (rev 119242)
+++ zc.recipe.cmmi/branches/patricks-buildout1.5/src/zc/recipe/cmmi/tests.py	2010-12-31 18:34:27 UTC (rev 119243)
@@ -94,6 +94,7 @@
                  ' = /sample_buildout'),
                 (re.compile('http://localhost:[0-9]{4,5}/'),
                  'http://localhost/'),
+                (re.compile('occured'), 'occurred'),
                ]),
             optionflags = doctest.ELLIPSIS
             ),