[Checkins] SVN: zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg/ Prepare renaming of browser fixture package from 'mypkg' to 'mypkg3' because py.test tries to load all fixtures at once and we need different package names then.

[Uli Fouquet]

Log message for revision 120711:
  Prepare renaming of browser fixture package from 'mypkg' to 'mypkg3' because py.test tries to load all fixtures at once and we need different package names then.

Changed:
  U   zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg/app.py
  U   zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg/ftesting.zcml
  U   zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg/tests/test_app.py
  U   zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg/tests/test_browser.py
  U   zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg/tests/test_foo.py

-=-
Modified: zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg/app.py
===================================================================
--- zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg/app.py	2011-03-02 22:16:03 UTC (rev 120710)
+++ zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg/app.py	2011-03-02 22:16:28 UTC (rev 120711)
@@ -1,5 +1,5 @@
 from zope.interface import implements
-from mypkg.interfaces import ISampleApp, IFoo
+from mypkg3.interfaces import ISampleApp, IFoo
 
 class SampleApp(object):
     implements(ISampleApp)

Modified: zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg/ftesting.zcml
===================================================================
--- zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg/ftesting.zcml	2011-03-02 22:16:03 UTC (rev 120710)
+++ zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg/ftesting.zcml	2011-03-02 22:16:28 UTC (rev 120711)
@@ -1,7 +1,7 @@
 <configure
    xmlns="http://namespaces.zope.org/zope"
    xmlns:browser="http://namespaces.zope.org/browser"
-   package="mypkg"
+   package="mypkg3"
    >
 
   <!-- This file is the equivalent of site.zcml and it is -->
@@ -16,6 +16,8 @@
   <include package="zope.app.wsgi" />
   <include package="zope.app.zcmlfiles" />
 
+  <include package="mypkg3" file="configure.zcml" />
+
   <securityPolicy
       component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy" />
 
@@ -40,19 +42,4 @@
 
   <grant role="zope.Manager" principal="zope.mgr" />
 
-  <utility 
-      component=".app.FooUtility"
-      provides=".interfaces.IFoo"
-      name="foo utility"
-      />
-
-  <browser:page
-      for=".interfaces.ISampleApp"
-      name="index.html"
-      class=".browser.SampleAppView"
-      permission="zope.View"
-      />
-
-  <include package="mypkg" file="configure.zcml" />
-
 </configure>

Modified: zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg/tests/test_app.py
===================================================================
--- zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg/tests/test_app.py	2011-03-02 22:16:03 UTC (rev 120710)
+++ zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg/tests/test_app.py	2011-03-02 22:16:28 UTC (rev 120711)
@@ -1,6 +1,6 @@
 from zope.interface.verify import verifyClass, verifyObject
-from mypkg.app import SampleApp
-from mypkg.interfaces import ISampleApp
+from mypkg3.app import SampleApp
+from mypkg3.interfaces import ISampleApp
 
 def test_app_create():
     # Assure we can create instances of `SampleApp`

Modified: zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg/tests/test_browser.py
===================================================================
--- zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg/tests/test_browser.py	2011-03-02 22:16:03 UTC (rev 120710)
+++ zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg/tests/test_browser.py	2011-03-02 22:16:28 UTC (rev 120711)
@@ -1,16 +1,18 @@
-import mypkg
+import pytest
+import mypkg3
 from webob import Request
 from zope.component import getMultiAdapter
 from zope.publisher.browser import TestRequest
 from zope.pytest import configure, create_app
-from mypkg.app import SampleApp
+from mypkg3.app import SampleApp
 
+
 def pytest_funcarg__apps(request):
     app = SampleApp()
     return app, create_app(request, app)
 
 def pytest_funcarg__config(request):
-    return configure(request, mypkg, 'ftesting.zcml')
+    return configure(request, mypkg3, 'ftesting.zcml')
 
 def test_view_sampleapp(config, apps):
     zope_app, wsgi_app = apps
@@ -25,3 +27,13 @@
     response = http_request.get_response(wsgi_app)
     assert response.body == 'Hello from SampleAppView!'
     assert response.status == "200 Ok"
+
+ at pytest.mark.xfail("sys.version_info < (2,6)")
+def test_infrae_browser(config, apps):
+    # Late import. This import will fail with Python < 2.6
+    from infrae.testbrowser.browser import Browser
+    zope_app, wsgi_app = apps
+    browser = Browser(wsgi_app)
+    browser.open('http://localhost/test/index.html')
+    assert browser.contents == 'Hello from SampleAppView!'
+    assert browser.status == '200 Ok'

Modified: zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg/tests/test_foo.py
===================================================================
--- zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg/tests/test_foo.py	2011-03-02 22:16:03 UTC (rev 120710)
+++ zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg/tests/test_foo.py	2011-03-02 22:16:28 UTC (rev 120711)
@@ -1,10 +1,10 @@
-import mypkg
+import mypkg3
 from zope.component import queryUtility
-from mypkg.interfaces import IFoo
+from mypkg3.interfaces import IFoo
 from zope.pytest import configure
 
 def pytest_funcarg__config(request):
-    return configure(request, mypkg, 'ftesting.zcml')
+    return configure(request, mypkg3, 'ftesting.zcml')
 
 def test_get_utility(config):
     util = queryUtility(IFoo, name='foo utility', default=None)