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

[Uli Fouquet]

Log message for revision 120710:
  Prepare renaming of ZCML fixture package from 'mypkg' to 'mypkg2' 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/zcml/mypkg/app.py
  U   zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/zcml/mypkg/configure.zcml
  U   zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/zcml/mypkg/ftesting.zcml
  U   zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/zcml/mypkg/tests/test_app.py
  U   zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/zcml/mypkg/tests/test_foo.py

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

Modified: zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/zcml/mypkg/configure.zcml
===================================================================
--- zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/zcml/mypkg/configure.zcml	2011-03-02 22:11:31 UTC (rev 120709)
+++ zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/zcml/mypkg/configure.zcml	2011-03-02 22:16:03 UTC (rev 120710)
@@ -1,5 +1,6 @@
 <configure
    xmlns="http://namespaces.zope.org/zope"
+   package="mypkg2"
    >
 
   <include package="zope.component" file="meta.zcml" />

Modified: zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/zcml/mypkg/ftesting.zcml
===================================================================
--- zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/zcml/mypkg/ftesting.zcml	2011-03-02 22:11:31 UTC (rev 120709)
+++ zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/zcml/mypkg/ftesting.zcml	2011-03-02 22:16:03 UTC (rev 120710)
@@ -1,8 +1,8 @@
 <configure
    xmlns="http://namespaces.zope.org/zope"
-   package="mypkg"
+   package="mypkg2"
    >
 
-  <include package="mypkg" file="configure.zcml" />
+  <include package="mypkg2" file="configure.zcml" />
 
 </configure>

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

Modified: zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/zcml/mypkg/tests/test_foo.py
===================================================================
--- zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/zcml/mypkg/tests/test_foo.py	2011-03-02 22:11:31 UTC (rev 120709)
+++ zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/zcml/mypkg/tests/test_foo.py	2011-03-02 22:16:03 UTC (rev 120710)
@@ -1,15 +1,15 @@
-import mypkg
+import mypkg2
 from zope.component import queryUtility
-from mypkg.interfaces import IFoo
+from mypkg2.interfaces import IFoo
 from zope.pytest import configure
 
-def pytest_funcarg__config(request):
-    return configure(request, mypkg, 'ftesting.zcml')
+def pytest_funcarg__config_mypkg2(request):
+    return configure(request, mypkg2, 'ftesting.zcml')
 
-def test_get_utility(config):
+def test_get_utility(config_mypkg2):
     util = queryUtility(IFoo, name='foo utility', default=None)
     assert util is not None
 
-def test_dofoo_utility(config):
+def test_dofoo_utility(config_mypkg2):
     util = queryUtility(IFoo, name='foo utility', default=None)
     assert util().do_foo() == 'Foo!'