[Checkins] SVN: zc.selenium/branches/wosc-zope2/ Fix tests due to changes in zope.testing 3.7.4.

[Sebastian Wehrmann]

Log message for revision 100629:
  Fix tests due to changes in zope.testing 3.7.4.
  Use fake-egg support from plone.recipe.zope2install.
  

Changed:
  _U  zc.selenium/branches/wosc-zope2/
  U   zc.selenium/branches/wosc-zope2/setup.py
  U   zc.selenium/branches/wosc-zope2/src/zc/selenium/pytest.txt
  A   zc.selenium/branches/wosc-zope2/src/zc/selenium/tests.zcml
  U   zc.selenium/branches/wosc-zope2/zope2.cfg

-=-

Property changes on: zc.selenium/branches/wosc-zope2
___________________________________________________________________
Modified: svn:ignore
   - .installed.cfg
develop-eggs
bin
parts

   + var
fake-eggs
downloads
.installed.cfg
develop-eggs
bin
parts


Modified: zc.selenium/branches/wosc-zope2/setup.py
===================================================================
--- zc.selenium/branches/wosc-zope2/setup.py	2009-06-04 07:53:37 UTC (rev 100628)
+++ zc.selenium/branches/wosc-zope2/setup.py	2009-06-04 08:38:19 UTC (rev 100629)
@@ -22,5 +22,7 @@
         'zope.component',
         'zope.publisher',
         'z3c.zrtresource',
+        'zope.testing>=3.7.4',
+        'wsgiref',
     ]
 )

Modified: zc.selenium/branches/wosc-zope2/src/zc/selenium/pytest.txt
===================================================================
--- zc.selenium/branches/wosc-zope2/src/zc/selenium/pytest.txt	2009-06-04 07:53:37 UTC (rev 100628)
+++ zc.selenium/branches/wosc-zope2/src/zc/selenium/pytest.txt	2009-06-04 08:38:19 UTC (rev 100629)
@@ -116,7 +116,7 @@
     </tr>
     <tr class="comment lineinfo">
     <td>comment</td>
-    <td><doctest pytest.txt[1]>:11 ...</td>
+    <td><doctest pytest.txt[line 54, example 1]>:11 ...</td>
     <td></td>
     </tr>
     <tr class="foo">
@@ -126,7 +126,7 @@
     </tr>
     <tr class="comment lineinfo">
     <td>comment</td>
-    <td><doctest pytest.txt[1]>:12 ...</td>
+    <td><doctest pytest.txt[line 54, example 1]>:12 ...</td>
     <td></td>
     </tr>
     <tr class="splat">
@@ -136,7 +136,7 @@
     </tr>
     <tr class="comment lineinfo">
     <td>comment</td>
-    <td><doctest pytest.txt[1]>:13 ...</td>
+    <td><doctest pytest.txt[line 54, example 1]>:13 ...</td>
     <td></td>
     </tr>
     <tr class="foo">
@@ -162,7 +162,7 @@
     </tr>
     <tr class="comment lineinfo">
     <td>comment</td>
-    <td><doctest pytest.txt[1]>:19 ...</td>
+    <td><doctest pytest.txt[line 54, example 1]>:19 ...</td>
     <td></td>
     </tr>
     <tr class="foo">
@@ -273,7 +273,7 @@
     </tr>
     <tr class="comment lineinfo">
     <td>comment</td>
-    <td><doctest pytest.txt[5]>:6 ...</td>
+    <td><doctest pytest.txt[line 231, example 5]>:6 ...</td>
     <td></td>
     </tr>
     <tr class="sample">
@@ -387,7 +387,7 @@
     </tr>
     <tr class="comment lineinfo">
     <td>comment</td>
-    <td><doctest pytest.txt[8]>:11 ...</td>
+    <td><doctest pytest.txt[line 324, example 8]>:11 ...</td>
     <td></td>
     </tr>
     <tr class="foo">
@@ -402,7 +402,7 @@
     </tr>
     <tr class="comment lineinfo">
     <td>comment</td>
-    <td><doctest pytest.txt[8]>:27 ...</td>
+    <td><doctest pytest.txt[line 324, example 8]>:27 ...</td>
     <td></td>
     </tr>
     <tr class="open">
@@ -434,7 +434,7 @@
     </tr>
     <tr class="comment lineinfo">
     <td>comment</td>
-    <td><doctest pytest.txt[8]>:33 ...</td>
+    <td><doctest pytest.txt[line 324, example 8]>:33 ...</td>
     <td></td>
     </tr>
     <tr class="foo">
@@ -465,7 +465,7 @@
     </tr>
     <tr class="comment lineinfo">
     <td>comment</td>
-    <td><doctest pytest.txt[8]>:15 ...</td>
+    <td><doctest pytest.txt[line 324, example 8]>:15 ...</td>
     <td></td>
     </tr>
     <tr class="foo">

Copied: zc.selenium/branches/wosc-zope2/src/zc/selenium/tests.zcml (from rev 100628, zc.selenium/trunk/src/zc/selenium/tests.zcml)
===================================================================
--- zc.selenium/branches/wosc-zope2/src/zc/selenium/tests.zcml	                        (rev 0)
+++ zc.selenium/branches/wosc-zope2/src/zc/selenium/tests.zcml	2009-06-04 08:38:19 UTC (rev 100629)
@@ -0,0 +1,10 @@
+<configure
+  xmlns="http://namespaces.zope.org/zope">
+
+  <adapter
+    factory=".tests.TestSelenium"
+    name="zc.selenium.tests.TestSelenium"
+    permission="zope.Public"
+    />
+
+</configure>

Modified: zc.selenium/branches/wosc-zope2/zope2.cfg
===================================================================
--- zc.selenium/branches/wosc-zope2/zope2.cfg	2009-06-04 07:53:37 UTC (rev 100628)
+++ zc.selenium/branches/wosc-zope2/zope2.cfg	2009-06-04 08:38:19 UTC (rev 100629)
@@ -1,11 +1,13 @@
 [buildout]
 develop = .
-parts = zope2 fakezope2eggs productdistros z2instance selenium-zope2 test
+parts = zope2 productdistros z2instance selenium-zope2 test
 
 
 [test]
 recipe = zc.recipe.testrunner
-eggs = zc.selenium
+eggs = 
+    zc.selenium
+    zope.testing >= 3.7.4
 extra-paths = ${zope2:location}/lib/python
 defaults = '--tests-pattern [fn]?tests'.split()
 working-directory = ${buildout:directory}
@@ -13,13 +15,13 @@
 [zope2]
 recipe = plone.recipe.zope2install
 url = http://www.zope.org/Products/Zope/2.9.9/Zope-2.9.9-final.tgz
-
-[fakezope2eggs]
-recipe = affinitic.recipe.fakezope2eggs
+fake-zope-eggs = true
 additional-fake-eggs =
     ZODB3
     mechanize
     ClientForm
+skip-fake-eggs =
+    zope.testing
 
 [productdistros]
 recipe = plone.recipe.distros