[Checkins] SVN: zc.recipe.zeo/branches/dev/src/zc/recipe/zeo/ Updated tests to reflect ZODB and buildout changes.

[Jim Fulton]

Log message for revision 74113:
  Updated tests to reflect ZODB and buildout changes.
  

Changed:
  U   zc.recipe.zeo/branches/dev/src/zc/recipe/zeo/README.txt
  U   zc.recipe.zeo/branches/dev/src/zc/recipe/zeo/tests.py

-=-
Modified: zc.recipe.zeo/branches/dev/src/zc/recipe/zeo/README.txt
===================================================================
--- zc.recipe.zeo/branches/dev/src/zc/recipe/zeo/README.txt	2007-04-12 20:02:40 UTC (rev 74112)
+++ zc.recipe.zeo/branches/dev/src/zc/recipe/zeo/README.txt	2007-04-12 20:02:42 UTC (rev 74113)
@@ -104,6 +104,12 @@
     import sys
     sys.path[0:0] = [
       '/sample-buildout/eggs/ZODB3-3.7.0-py2.4-linux-i686.egg',
+      '/sample-buildout/eggs/zdaemon-2.0-py2.4.egg',
+      '/sample-buildout/eggs/ZConfig-2.4-py2.4.egg',
+      '/sample-buildout/eggs/zope.testing-3.4-py2.4.egg',
+      '/sample-buildout/eggs/setuptools-0.6-py2.4.egg',
+      '/sample-buildout/eggs/zope.proxy-3.4-py2.4.egg',
+      '/sample-buildout/eggs/zope.interface-3.4-py2.4.egg',
       ]
     <BLANKLINE>
     import zdaemon.zdrun
@@ -117,6 +123,12 @@
     import sys
     sys.path[0:0] = [
       '/sample-buildout/eggs/ZODB3-3.7.0-py2.4-linux-i686.egg',
+      '/sample-buildout/eggs/zdaemon-2.0-py2.4.egg',
+      '/sample-buildout/eggs/ZConfig-2.4-py2.4.egg',
+      '/sample-buildout/eggs/zope.testing-3.4-py2.4.egg',
+      '/sample-buildout/eggs/setuptools-0.6-py2.4.egg',
+      '/sample-buildout/eggs/zope.proxy-3.4-py2.4.egg',
+      '/sample-buildout/eggs/zope.interface-3.4-py2.4.egg',
       ]
     <BLANKLINE>
     import ZEO.runzeo
@@ -134,6 +146,12 @@
     import sys
     sys.path[0:0] = [
       '/sample-buildout/eggs/ZODB3-3.7.0-py2.4-linux-i686.egg',
+      '/sample-buildout/eggs/zdaemon-2.0-py2.4.egg',
+      '/sample-buildout/eggs/ZConfig-2.4-py2.4.egg',
+      '/sample-buildout/eggs/zope.testing-3.4-py2.4.egg',
+      '/sample-buildout/eggs/setuptools-0.6-py2.4.egg',
+      '/sample-buildout/eggs/zope.proxy-3.4-py2.4.egg',
+      '/sample-buildout/eggs/zope.interface-3.4-py2.4.egg',
       ]
     <BLANKLINE>
     import ZEO.zeoctl
@@ -190,7 +208,7 @@
     ... ''')
 
     >>> print system(join('bin', 'buildout')),
-    buildout: Develop: /sample-buildout/recipes/setup.py
+    buildout: Develop: /sample-buildout/recipes
     <zodb>
       <zeoclient>
          server 8100

Modified: zc.recipe.zeo/branches/dev/src/zc/recipe/zeo/tests.py
===================================================================
--- zc.recipe.zeo/branches/dev/src/zc/recipe/zeo/tests.py	2007-04-12 20:02:40 UTC (rev 74112)
+++ zc.recipe.zeo/branches/dev/src/zc/recipe/zeo/tests.py	2007-04-12 20:02:42 UTC (rev 74113)
@@ -23,6 +23,11 @@
     zc.buildout.testing.install_develop('zc.recipe.zeo', test)
     zc.buildout.testing.install_develop('zc.recipe.egg', test)
     zc.buildout.testing.install('ZODB3', test)
+    zc.buildout.testing.install('zdaemon', test)
+    zc.buildout.testing.install('ZConfig', test)
+    zc.buildout.testing.install('zope.testing', test)
+    zc.buildout.testing.install('zope.proxy', test)
+    zc.buildout.testing.install('zope.interface', test)
 
 def test_suite():
     return unittest.TestSuite((
@@ -35,8 +40,9 @@
                zc.buildout.testing.normalize_script,
                zc.buildout.testing.normalize_egg_py,        
                (re.compile('#!\S+python\S*'), '#!python'),
-               (re.compile('setuptools-[^-]+-'), 'setuptools-X-'),
-               (re.compile('ZODB3-\S+[.]egg'), 'ZODB3.egg'),
+               (re.compile('/sample-buildout/eggs/'
+                           '([a-zA-Z.0-9]+)-\S+-pyN.N(-\S+)?.egg'),
+                r'/sample-buildout/eggs/\1-N.N-py2.4.egg'),
                (re.compile(r"\nCouldn't find index page for 'ZODB3' "
                            r"\(maybe misspelled\?\)"),
                 ''),