[Checkins] SVN: grokui.admin/trunk/src/grokui/admin/ Moving the ftesting.zcml inside the tests module.
Souheil CHELFOUH
souheil at chelfouh.com
Tue Feb 23 13:03:03 EST 2010
Log message for revision 109373:
Moving the ftesting.zcml inside the tests module.
Need more work on the tests pep8
Changed:
D grokui.admin/trunk/src/grokui/admin/ftesting.zcml
A grokui.admin/trunk/src/grokui/admin/tests/ftesting.zcml
U grokui.admin/trunk/src/grokui/admin/tests/test_grokadmin.py
U grokui.admin/trunk/src/grokui/admin/tests/test_grokadmin_functional.py
-=-
Deleted: grokui.admin/trunk/src/grokui/admin/ftesting.zcml
===================================================================
--- grokui.admin/trunk/src/grokui/admin/ftesting.zcml 2010-02-23 17:57:09 UTC (rev 109372)
+++ grokui.admin/trunk/src/grokui/admin/ftesting.zcml 2010-02-23 18:03:02 UTC (rev 109373)
@@ -1,36 +0,0 @@
-<configure
- xmlns="http://namespaces.zope.org/zope"
- xmlns:grok="http://namespaces.zope.org/grok"
- i18n_domain="grok"
- package="grokui.admin">
-
- <include package="grokui.base" />
- <include package="grokui.admin" />
- <grok:grok package="grokui.admin.tests" />
-
- <securityPolicy
- component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy"
- />
-
- <unauthenticatedPrincipal
- id="zope.anybody"
- title="Unauthenticated User"
- />
-
- <grant
- permission="zope.View"
- principal="zope.anybody"
- />
-
- <principal
- id="zope.mgr"
- title="Manager"
- login="mgr"
- password="mgrpw"
- />
-
- <role id="zope.Manager" title="Site Manager" />
- <grantAll role="zope.Manager" />
- <grant role="zope.Manager" principal="zope.mgr" />
-
-</configure>
Copied: grokui.admin/trunk/src/grokui/admin/tests/ftesting.zcml (from rev 109370, grokui.admin/trunk/src/grokui/admin/ftesting.zcml)
===================================================================
--- grokui.admin/trunk/src/grokui/admin/tests/ftesting.zcml (rev 0)
+++ grokui.admin/trunk/src/grokui/admin/tests/ftesting.zcml 2010-02-23 18:03:02 UTC (rev 109373)
@@ -0,0 +1,36 @@
+<configure
+ xmlns="http://namespaces.zope.org/zope"
+ xmlns:grok="http://namespaces.zope.org/grok"
+ i18n_domain="grok"
+ package="grokui.admin">
+
+ <include package="grokui.base" />
+ <include package="grokui.admin" />
+ <grok:grok package="grokui.admin.tests" />
+
+ <securityPolicy
+ component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy"
+ />
+
+ <unauthenticatedPrincipal
+ id="zope.anybody"
+ title="Unauthenticated User"
+ />
+
+ <grant
+ permission="zope.View"
+ principal="zope.anybody"
+ />
+
+ <principal
+ id="zope.mgr"
+ title="Manager"
+ login="mgr"
+ password="mgrpw"
+ />
+
+ <role id="zope.Manager" title="Site Manager" />
+ <grantAll role="zope.Manager" />
+ <grant role="zope.Manager" principal="zope.mgr" />
+
+</configure>
Modified: grokui.admin/trunk/src/grokui/admin/tests/test_grokadmin.py
===================================================================
--- grokui.admin/trunk/src/grokui/admin/tests/test_grokadmin.py 2010-02-23 17:57:09 UTC (rev 109372)
+++ grokui.admin/trunk/src/grokui/admin/tests/test_grokadmin.py 2010-02-23 18:03:02 UTC (rev 109373)
@@ -15,16 +15,19 @@
import os
import unittest
+import zope.component.eventtesting
from pkg_resources import resource_listdir
from zope.testing import doctest, cleanup
-import zope.component.eventtesting
+
def setUpZope(test):
zope.component.eventtesting.setUp(test)
+
def cleanUpZope(test):
cleanup.cleanUp()
+
def suiteFromPackage(name):
files = resource_listdir(__name__, name)
suite = unittest.TestSuite()
@@ -46,12 +49,14 @@
suite.addTest(test)
return suite
+
def pnorm(path):
"""Normalization of paths to use forward slashes. This is needed
to make sure the tests work on windows.
"""
return path.replace(os.sep, '/')
+
def test_suite():
suite = unittest.TestSuite()
globs = {'pnorm': pnorm}
Modified: grokui.admin/trunk/src/grokui/admin/tests/test_grokadmin_functional.py
===================================================================
--- grokui.admin/trunk/src/grokui/admin/tests/test_grokadmin_functional.py 2010-02-23 17:57:09 UTC (rev 109372)
+++ grokui.admin/trunk/src/grokui/admin/tests/test_grokadmin_functional.py 2010-02-23 18:03:02 UTC (rev 109373)
@@ -5,26 +5,31 @@
from pkg_resources import resource_listdir
from zope.testing import doctest, renormalizing
-from zope.app.testing.functional import (HTTPCaller, getRootFolder,
- FunctionalTestSetup, sync, ZCMLLayer)
+from zope.app.testing.functional import (
+ HTTPCaller, getRootFolder, FunctionalTestSetup, sync, ZCMLLayer)
-ftesting_zcml = os.path.join(os.path.dirname(grokui.admin.__file__),
- 'ftesting.zcml')
-GrokAdminFunctionalLayer = ZCMLLayer(ftesting_zcml, __name__,
- 'GrokAdminFunctionalLayer',
- allow_teardown = True)
+ftesting_zcml = os.path.join(
+ os.path.dirname(__file__), 'ftesting.zcml')
+
+GrokAdminFunctionalLayer = ZCMLLayer(
+ ftesting_zcml, __name__, 'GrokAdminFunctionalLayer', allow_teardown = True)
+
+
def setUp(test):
FunctionalTestSetup().setUp()
+
def tearDown(test):
FunctionalTestSetup().tearDown()
+
checker = renormalizing.RENormalizing([
# Accommodate to exception wrapping in newer versions of mechanize
(re.compile(r'httperror_seek_wrapper:', re.M), 'HTTPError:'),
])
+
def http_call(method, path, data=None, **kw):
"""Function to help make RESTful calls.
@@ -44,6 +49,7 @@
request_string += data
return HTTPCaller()(request_string, handle_errors=False)
+
def test_suite():
suite = unittest.TestSuite()
files = resource_listdir(__name__, '')
@@ -72,5 +78,6 @@
suite.addTest(test)
return suite
+
if __name__ == '__main__':
unittest.main(defaultTest='test_suite')
More information about the checkins
mailing list