[Checkins] SVN: grokcore.site/trunk/ Update tests not to depend on zope.app.zcmfiles anymore.
Sylvain Viollon
sylvain at infrae.com
Wed Apr 14 08:50:03 EDT 2010
Log message for revision 110878:
Update tests not to depend on zope.app.zcmfiles anymore.
Remove unused imports.
Changed:
U grokcore.site/trunk/CHANGES.txt
U grokcore.site/trunk/setup.py
U grokcore.site/trunk/src/grokcore/site/configure.zcml
U grokcore.site/trunk/src/grokcore/site/ftesting.zcml
U grokcore.site/trunk/src/grokcore/site/ftests/test_grok_functional.py
U grokcore.site/trunk/src/grokcore/site/meta.zcml
U grokcore.site/trunk/src/grokcore/site/tests/utility/local_implementsnone_fixture.py
-=-
Modified: grokcore.site/trunk/CHANGES.txt
===================================================================
--- grokcore.site/trunk/CHANGES.txt 2010-04-14 12:49:24 UTC (rev 110877)
+++ grokcore.site/trunk/CHANGES.txt 2010-04-14 12:50:03 UTC (rev 110878)
@@ -6,6 +6,8 @@
- Update functional tests to only use zope.app.appsetup instead
of zope.app.testing.
+- Update functional tests not to require zope.app.zcmlfiles
+ anymore.
1.2 (2009-12-20)
----------------
Modified: grokcore.site/trunk/setup.py
===================================================================
--- grokcore.site/trunk/setup.py 2010-04-14 12:49:24 UTC (rev 110877)
+++ grokcore.site/trunk/setup.py 2010-04-14 12:50:03 UTC (rev 110878)
@@ -12,9 +12,9 @@
tests_require = [
'zope.app.appsetup',
- 'zope.app.zcmlfiles',
'zope.component',
'zope.configuration',
+ 'zope.location',
'zope.testing',
]
@@ -50,7 +50,6 @@
'zope.interface',
'zope.lifecycleevent',
'zope.site',
- 'zope.location',
],
tests_require=tests_require,
extras_require={'test': tests_require},
Modified: grokcore.site/trunk/src/grokcore/site/configure.zcml
===================================================================
--- grokcore.site/trunk/src/grokcore/site/configure.zcml 2010-04-14 12:49:24 UTC (rev 110877)
+++ grokcore.site/trunk/src/grokcore/site/configure.zcml 2010-04-14 12:50:03 UTC (rev 110878)
@@ -4,6 +4,8 @@
xmlns:grok="http://namespaces.zope.org/grok">
<include package="." file="meta.zcml" />
+ <include package="zope.component" file="meta.zcml" />
+ <include package="zope.component" />
<grok:grok package=".subscriber" />
<utility component=".meta.setupUtility" />
Modified: grokcore.site/trunk/src/grokcore/site/ftesting.zcml
===================================================================
--- grokcore.site/trunk/src/grokcore/site/ftesting.zcml 2010-04-14 12:49:24 UTC (rev 110877)
+++ grokcore.site/trunk/src/grokcore/site/ftesting.zcml 2010-04-14 12:50:03 UTC (rev 110878)
@@ -3,14 +3,13 @@
xmlns:grok="http://namespaces.zope.org/grok"
xmlns:browser="http://namespaces.zope.org/browser"
i18n_domain="grokcore.site"
- package="grokcore.site"
- >
+ package="grokcore.site">
- <include package="zope.app.zcmlfiles" file="meta.zcml" />
- <include package="grokcore.site" file="meta.zcml" />
+ <include package="zope.app.appsetup" file="ftesting.zcml" />
- <include package="zope.app.zcmlfiles" />
+ <include package="grokcore.site" file="meta.zcml" />
<include package="grokcore.site" />
+
<grok:grok package="grokcore.site.ftests" />
</configure>
Modified: grokcore.site/trunk/src/grokcore/site/ftests/test_grok_functional.py
===================================================================
--- grokcore.site/trunk/src/grokcore/site/ftests/test_grok_functional.py 2010-04-14 12:49:24 UTC (rev 110877)
+++ grokcore.site/trunk/src/grokcore/site/ftests/test_grok_functional.py 2010-04-14 12:50:03 UTC (rev 110878)
@@ -2,7 +2,7 @@
import grokcore.site
from pkg_resources import resource_listdir
-from zope.testing import doctest, renormalizing
+from zope.testing import doctest
from zope.app.appsetup.testlayer import ZODBLayer
FunctionalLayer = ZODBLayer(grokcore.site)
Modified: grokcore.site/trunk/src/grokcore/site/meta.zcml
===================================================================
--- grokcore.site/trunk/src/grokcore/site/meta.zcml 2010-04-14 12:49:24 UTC (rev 110877)
+++ grokcore.site/trunk/src/grokcore/site/meta.zcml 2010-04-14 12:50:03 UTC (rev 110878)
@@ -2,7 +2,7 @@
xmlns="http://namespaces.zope.org/zope"
xmlns:meta="http://namespaces.zope.org/meta"
xmlns:grok="http://namespaces.zope.org/grok">
-
+
<include package="grokcore.component" file="meta.zcml" />
<grok:grok package=".meta" />
Modified: grokcore.site/trunk/src/grokcore/site/tests/utility/local_implementsnone_fixture.py
===================================================================
--- grokcore.site/trunk/src/grokcore/site/tests/utility/local_implementsnone_fixture.py 2010-04-14 12:49:24 UTC (rev 110877)
+++ grokcore.site/trunk/src/grokcore/site/tests/utility/local_implementsnone_fixture.py 2010-04-14 12:50:03 UTC (rev 110878)
@@ -1,5 +1,4 @@
import grokcore.site
-from zope import interface
class Fireplace(object):
pass
More information about the checkins
mailing list