[Checkins] SVN: grokcore.view/trunk/src/grokcore/view/ftests/test_
Cosmetic renaming of test module
Philipp von Weitershausen
philikon at philikon.de
Thu Aug 7 17:25:31 EDT 2008
Log message for revision 89503:
Cosmetic renaming of test module
Changed:
A grokcore.view/trunk/src/grokcore/view/ftests/test_functional.py
D grokcore.view/trunk/src/grokcore/view/ftests/test_grok_functional.py
-=-
Copied: grokcore.view/trunk/src/grokcore/view/ftests/test_functional.py (from rev 89499, grokcore.view/trunk/src/grokcore/view/ftests/test_grok_functional.py)
===================================================================
--- grokcore.view/trunk/src/grokcore/view/ftests/test_functional.py (rev 0)
+++ grokcore.view/trunk/src/grokcore/view/ftests/test_functional.py 2008-08-07 21:25:30 UTC (rev 89503)
@@ -0,0 +1,56 @@
+import re
+import unittest
+import os.path
+import grokcore.view
+
+from pkg_resources import resource_listdir
+from zope.testing import doctest, renormalizing
+from zope.app.testing.functional import (HTTPCaller, getRootFolder,
+ FunctionalTestSetup, sync, ZCMLLayer)
+
+ftesting_zcml = os.path.join(os.path.dirname(grokcore.view.__file__),
+ 'ftesting.zcml')
+FunctionalLayer = ZCMLLayer(ftesting_zcml, __name__, 'FunctionalLayer',
+ 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 suiteFromPackage(name):
+ files = resource_listdir(__name__, name)
+ suite = unittest.TestSuite()
+ for filename in files:
+ if not filename.endswith('.py'):
+ continue
+ if filename == '__init__.py':
+ continue
+
+ dottedname = 'grokcore.view.ftests.%s.%s' % (name, filename[:-3])
+ test = doctest.DocTestSuite(
+ dottedname, setUp=setUp, tearDown=tearDown,
+ checker=checker,
+ extraglobs=dict(http=HTTPCaller(),
+ getRootFolder=getRootFolder,
+ sync=sync),
+ optionflags=(doctest.ELLIPSIS+
+ doctest.NORMALIZE_WHITESPACE+
+ doctest.REPORT_NDIFF)
+ )
+ test.layer = FunctionalLayer
+
+ suite.addTest(test)
+ return suite
+
+def test_suite():
+ suite = unittest.TestSuite()
+ for name in ['view', 'staticdir', 'url']:
+ suite.addTest(suiteFromPackage(name))
+ return suite
Deleted: grokcore.view/trunk/src/grokcore/view/ftests/test_grok_functional.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/ftests/test_grok_functional.py 2008-08-07 21:24:07 UTC (rev 89502)
+++ grokcore.view/trunk/src/grokcore/view/ftests/test_grok_functional.py 2008-08-07 21:25:30 UTC (rev 89503)
@@ -1,56 +0,0 @@
-import re
-import unittest
-import os.path
-import grokcore.view
-
-from pkg_resources import resource_listdir
-from zope.testing import doctest, renormalizing
-from zope.app.testing.functional import (HTTPCaller, getRootFolder,
- FunctionalTestSetup, sync, ZCMLLayer)
-
-ftesting_zcml = os.path.join(os.path.dirname(grokcore.view.__file__),
- 'ftesting.zcml')
-FunctionalLayer = ZCMLLayer(ftesting_zcml, __name__, 'FunctionalLayer',
- 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 suiteFromPackage(name):
- files = resource_listdir(__name__, name)
- suite = unittest.TestSuite()
- for filename in files:
- if not filename.endswith('.py'):
- continue
- if filename == '__init__.py':
- continue
-
- dottedname = 'grokcore.view.ftests.%s.%s' % (name, filename[:-3])
- test = doctest.DocTestSuite(
- dottedname, setUp=setUp, tearDown=tearDown,
- checker=checker,
- extraglobs=dict(http=HTTPCaller(),
- getRootFolder=getRootFolder,
- sync=sync),
- optionflags=(doctest.ELLIPSIS+
- doctest.NORMALIZE_WHITESPACE+
- doctest.REPORT_NDIFF)
- )
- test.layer = FunctionalLayer
-
- suite.addTest(test)
- return suite
-
-def test_suite():
- suite = unittest.TestSuite()
- for name in ['view', 'staticdir', 'url']:
- suite.addTest(suiteFromPackage(name))
- return suite
More information about the Checkins
mailing list