[Checkins] SVN: grokcore.view/branches/ulif-zawsgi_ftests/src/grokcore/view/ftests/test_functional.py Clean up test setup.
Uli Fouquet
uli at gnufix.de
Tue May 25 12:03:15 EDT 2010
Log message for revision 112705:
Clean up test setup.
Changed:
U grokcore.view/branches/ulif-zawsgi_ftests/src/grokcore/view/ftests/test_functional.py
-=-
Modified: grokcore.view/branches/ulif-zawsgi_ftests/src/grokcore/view/ftests/test_functional.py
===================================================================
--- grokcore.view/branches/ulif-zawsgi_ftests/src/grokcore/view/ftests/test_functional.py 2010-05-25 15:54:15 UTC (rev 112704)
+++ grokcore.view/branches/ulif-zawsgi_ftests/src/grokcore/view/ftests/test_functional.py 2010-05-25 16:03:15 UTC (rev 112705)
@@ -5,26 +5,13 @@
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)
+
from zope.app.wsgi.testlayer import BrowserLayer, http
+from zope.testing import doctest, renormalizing
-ftesting_zcml = os.path.join(os.path.dirname(grokcore.view.__file__),
- 'ftesting.zcml')
-#FunctionalLayer = ZCMLLayer(ftesting_zcml, __name__, 'FunctionalLayer',
-# allow_teardown=True)
-FunctionalLayer = BrowserLayer(grokcore.view, 'ftesting.zcml')
-#FunctionalLayer = BrowserLayer(grokcore.view, ftesting_zcml)
-#FunctionalLayer = BrowserLayer(grokcore.view)
-#def setUp(test):
-# FunctionalTestSetup().setUp()
-#def tearDown(test):
-# FunctionalTestSetup().tearDown()
+FunctionalLayer = BrowserLayer(grokcore.view)
-
-
checker = renormalizing.RENormalizing([
# Accommodate to exception wrapping in newer versions of mechanize
(re.compile(r'httperror_seek_wrapper:', re.M), 'HTTPError:'),
@@ -42,12 +29,10 @@
dottedname = 'grokcore.view.ftests.%s.%s' % (name, filename[:-3])
test = doctest.DocTestSuite(
- dottedname, #setUp=setUp, tearDown=tearDown,
- #checker=checker,
- extraglobs=dict(#http=HTTPCaller(),
- http=http,
+ dottedname,
+ checker=checker,
+ extraglobs=dict(http=http,
getRootFolder=getRootFolder,
- #sync=sync),
),
optionflags=(doctest.ELLIPSIS+
doctest.NORMALIZE_WHITESPACE+
More information about the checkins
mailing list