[Checkins] SVN: zc.recipe.wrapper/trunk/src/zc/recipe/wrapper/ fix remaining tests

[Alex Smith]

Log message for revision 112625:
  fix remaining tests
  
  

Changed:
  U   zc.recipe.wrapper/trunk/src/zc/recipe/wrapper/README.txt
  U   zc.recipe.wrapper/trunk/src/zc/recipe/wrapper/tests.py

-=-
Modified: zc.recipe.wrapper/trunk/src/zc/recipe/wrapper/README.txt
===================================================================
--- zc.recipe.wrapper/trunk/src/zc/recipe/wrapper/README.txt	2010-05-21 15:20:15 UTC (rev 112624)
+++ zc.recipe.wrapper/trunk/src/zc/recipe/wrapper/README.txt	2010-05-21 15:30:02 UTC (rev 112625)
@@ -40,7 +40,7 @@
     ... """ % wrapper)
     >>> os.chdir(sample_buildout)
     >>> buildout.install([])
-    Develop: '/.../USER/work/zc.recipe.wrapper'
+    Develop: '...'
     Installing interpreter.
     Getting distribution for 'zope.testing==3.5.0'.
     Got zope.testing 3.5.0.
@@ -56,7 +56,7 @@
                      'recipe': 'zc.recipe.egg'},
      'versions': {...}}
     >>> print ls(os.path.join(sample_buildout, 'bin/py'))
-    -rwxr-xr-x USER USER PREFIX/bin/py
+    -rwxr-xr-x USER GROUP PREFIX/bin/py
     >>> print ls(os.path.join(sample_buildout, 'bin/basepy'))
     Traceback (most recent call last):
         ...
@@ -94,7 +94,7 @@
     ... """ % wrapper)
     >>> os.chdir(sample_buildout)
     >>> buildout.install([])
-    Develop: '/.../USER/work/zc.recipe.wrapper'
+    Develop: '...'
     Installing interpreter.
     Getting distribution for 'zope.testing==3.5.0'.
     Got zope.testing 3.5.0.
@@ -120,9 +120,9 @@
      'py-environment': {'LD_LIBRARY': 'some_library_I_like'},
      'versions': {...}}
     >>> print ls(os.path.join(sample_buildout, 'bin/py'))
-    -rwxr-xr-x USER USER PREFIX/bin/py
+    -rwxr-xr-x USER GROUP PREFIX/bin/py
     >>> print ls(os.path.join(sample_buildout, 'bin/basepy'))
-    -rwxr-xr-x USER USER PREFIX/bin/basepy
+    -rwxr-xr-x USER GROUP PREFIX/bin/basepy
     >>> cat(sample_buildout, 'bin', 'py')
     #!...
     import os
@@ -184,7 +184,7 @@
     >>> buildout = setupBuildout(sample_buildout, "buildout.cfg", buildout_cfg)
     >>> os.chdir(sample_buildout)
     >>> buildout.install([])
-    Develop: '/.../USER/work/zc.recipe.wrapper'
+    Develop: '...'
     Installing interpreter.
     Getting distribution for 'zope.testing==3.5.0'.
     Got zope.testing 3.5.0.
@@ -195,7 +195,7 @@
     Generated interpreter 'PREFIX/bin/basepy'.
     Installing py.
     >>> print ls(os.path.join(sample_buildout, 'bin/py'))
-    -rwxr-xr-x USER USER PREFIX/bin/py
+    -rwxr-xr-x USER GROUP PREFIX/bin/py
     >>> os.chdir(wrapper)
 
 Now, suppose we were to run it on a Macintosh?
@@ -204,7 +204,7 @@
     >>> buildout = setupBuildout(sample_buildout, "buildout.cfg", buildout_cfg)
     >>> os.chdir(sample_buildout)
     >>> buildout.install([])
-    Develop: '/.../USER/work/zc.recipe.wrapper'
+    Develop: '...'
     Installing interpreter.
     Getting distribution for 'zope.testing==3.5.0'.
     Got zope.testing 3.5.0.

Modified: zc.recipe.wrapper/trunk/src/zc/recipe/wrapper/tests.py
===================================================================
--- zc.recipe.wrapper/trunk/src/zc/recipe/wrapper/tests.py	2010-05-21 15:20:15 UTC (rev 112624)
+++ zc.recipe.wrapper/trunk/src/zc/recipe/wrapper/tests.py	2010-05-21 15:30:02 UTC (rev 112625)
@@ -114,12 +114,12 @@
             checker=renormalizing.RENormalizing([
                 (re.compile('\d+ \d\d\d\d-\d\d-\d\d \d\d:\d\d'), ''),
                 (re.compile(user), 'USER'),
+                (re.compile(group), 'GROUP'),
                 (re.compile('/.*/sample-buildout'), 'PREFIX'),
                ]),
             optionflags = (zope.testing.doctest.REPORT_NDIFF
                            | zope.testing.doctest.ELLIPSIS)
             ),
-        
         ))
 
 if __name__ == '__main__':