[Checkins] SVN: grokcore.view/branches/ulif-zawsgi_ftests/ Use z.a.wsgi instead of zope.app.testing.

Uli Fouquet uli at gnufix.de
Tue May 25 11:28:14 EDT 2010


Log message for revision 112702:
  Use z.a.wsgi instead of zope.app.testing.

Changed:
  U   grokcore.view/branches/ulif-zawsgi_ftests/buildout.cfg
  U   grokcore.view/branches/ulif-zawsgi_ftests/setup.py
  U   grokcore.view/branches/ulif-zawsgi_ftests/src/grokcore/view/ftests/directoryresource/dirresource.py
  U   grokcore.view/branches/ulif-zawsgi_ftests/src/grokcore/view/ftests/staticdir/simple.py
  U   grokcore.view/branches/ulif-zawsgi_ftests/src/grokcore/view/ftests/test_functional.py
  U   grokcore.view/branches/ulif-zawsgi_ftests/src/grokcore/view/ftests/url/redirect.py
  U   grokcore.view/branches/ulif-zawsgi_ftests/src/grokcore/view/ftests/url/url.py
  U   grokcore.view/branches/ulif-zawsgi_ftests/src/grokcore/view/ftests/url/url_function.py
  U   grokcore.view/branches/ulif-zawsgi_ftests/src/grokcore/view/ftests/view/argument.py
  U   grokcore.view/branches/ulif-zawsgi_ftests/src/grokcore/view/ftests/view/index.py
  U   grokcore.view/branches/ulif-zawsgi_ftests/src/grokcore/view/ftests/view/macros.py
  U   grokcore.view/branches/ulif-zawsgi_ftests/src/grokcore/view/ftests/view/skindirective.py
  U   grokcore.view/branches/ulif-zawsgi_ftests/src/grokcore/view/ftests/view/view.py

-=-
Modified: grokcore.view/branches/ulif-zawsgi_ftests/buildout.cfg
===================================================================
--- grokcore.view/branches/ulif-zawsgi_ftests/buildout.cfg	2010-05-25 15:12:30 UTC (rev 112701)
+++ grokcore.view/branches/ulif-zawsgi_ftests/buildout.cfg	2010-05-25 15:28:14 UTC (rev 112702)
@@ -12,6 +12,7 @@
 grokcore.view = 
 martian = 0.12
 grokcore.component = 2.0
+zope.app.wsgi = 3.9.2
 
 
 [interpreter]

Modified: grokcore.view/branches/ulif-zawsgi_ftests/setup.py
===================================================================
--- grokcore.view/branches/ulif-zawsgi_ftests/setup.py	2010-05-25 15:12:30 UTC (rev 112701)
+++ grokcore.view/branches/ulif-zawsgi_ftests/setup.py	2010-05-25 15:28:14 UTC (rev 112702)
@@ -27,6 +27,7 @@
 
 tests_require = [
     'zope.app.testing',
+    'zope.app.wsgi',
     'zope.container',
     'zope.securitypolicy',
     'zope.site',

Modified: grokcore.view/branches/ulif-zawsgi_ftests/src/grokcore/view/ftests/directoryresource/dirresource.py
===================================================================
--- grokcore.view/branches/ulif-zawsgi_ftests/src/grokcore/view/ftests/directoryresource/dirresource.py	2010-05-25 15:12:30 UTC (rev 112701)
+++ grokcore.view/branches/ulif-zawsgi_ftests/src/grokcore/view/ftests/directoryresource/dirresource.py	2010-05-25 15:28:14 UTC (rev 112702)
@@ -37,7 +37,7 @@
   ...     'anotherfile.txt')
   Traceback (most recent call last):
   ...
-  httperror_seek_wrapper: HTTP Error 404: Not Found
+  HTTPError: HTTP Error 404: Not Found
 
 Directoryresources can be registered under an explicit name::
 

Modified: grokcore.view/branches/ulif-zawsgi_ftests/src/grokcore/view/ftests/staticdir/simple.py
===================================================================
--- grokcore.view/branches/ulif-zawsgi_ftests/src/grokcore/view/ftests/staticdir/simple.py	2010-05-25 15:12:30 UTC (rev 112701)
+++ grokcore.view/branches/ulif-zawsgi_ftests/src/grokcore/view/ftests/staticdir/simple.py	2010-05-25 15:28:14 UTC (rev 112702)
@@ -2,7 +2,7 @@
 If there is a static/ directory inside of a grokked package, its
 contents will be available as static resources under a URL:
 
-  >>> from zope.testbrowser.testing import Browser
+  >>> from zope.app.wsgi.testlayer import Browser
   >>> browser = Browser()
   >>> browser.handleErrors = False
   >>> browser.open(

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:12:30 UTC (rev 112701)
+++ grokcore.view/branches/ulif-zawsgi_ftests/src/grokcore/view/ftests/test_functional.py	2010-05-25 15:28:14 UTC (rev 112702)
@@ -1,3 +1,4 @@
+import doctest
 import re
 import unittest
 import os.path
@@ -5,20 +6,25 @@
 
 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)
+from zope.app.wsgi.testlayer import BrowserLayer, http
 
 ftesting_zcml = os.path.join(os.path.dirname(grokcore.view.__file__),
                              'ftesting.zcml')
-FunctionalLayer = ZCMLLayer(ftesting_zcml, __name__, 'FunctionalLayer',
-                            allow_teardown=True)
+#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 setUp(test):
-    FunctionalTestSetup().setUp()
+#def tearDown(test):
+#    FunctionalTestSetup().tearDown()
 
-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:'),
@@ -27,6 +33,7 @@
 def suiteFromPackage(name):
     files = resource_listdir(__name__, name)
     suite = unittest.TestSuite()
+    getRootFolder = FunctionalLayer.getRootFolder
     for filename in files:
         if not filename.endswith('.py'):
             continue
@@ -35,14 +42,16 @@
 
         dottedname = 'grokcore.view.ftests.%s.%s' % (name, filename[:-3])
         test = doctest.DocTestSuite(
-            dottedname, setUp=setUp, tearDown=tearDown,
-            checker=checker,
-            extraglobs=dict(http=HTTPCaller(),
+            dottedname, #setUp=setUp, tearDown=tearDown,
+            #checker=checker,
+            extraglobs=dict(#http=HTTPCaller(),
+                            http=http,
                             getRootFolder=getRootFolder,
-                            sync=sync),
+                            #sync=sync),
+                            ),
             optionflags=(doctest.ELLIPSIS+
                          doctest.NORMALIZE_WHITESPACE+
-                         doctest.REPORT_NDIFF)
+                         doctest.REPORT_NDIFF),
             )
         test.layer = FunctionalLayer
 

Modified: grokcore.view/branches/ulif-zawsgi_ftests/src/grokcore/view/ftests/url/redirect.py
===================================================================
--- grokcore.view/branches/ulif-zawsgi_ftests/src/grokcore/view/ftests/url/redirect.py	2010-05-25 15:12:30 UTC (rev 112701)
+++ grokcore.view/branches/ulif-zawsgi_ftests/src/grokcore/view/ftests/url/redirect.py	2010-05-25 15:28:14 UTC (rev 112702)
@@ -6,7 +6,7 @@
 Since the index view redirects to mammoth, we expect to see the URL
 point to mammoth:
 
-  >>> from zope.testbrowser.testing import Browser
+  >>> from zope.app.wsgi.testlayer import Browser
   >>> browser = Browser()
   >>> browser.handleErrors = False
   >>> browser.open('http://localhost/manfred')

Modified: grokcore.view/branches/ulif-zawsgi_ftests/src/grokcore/view/ftests/url/url.py
===================================================================
--- grokcore.view/branches/ulif-zawsgi_ftests/src/grokcore/view/ftests/url/url.py	2010-05-25 15:12:30 UTC (rev 112701)
+++ grokcore.view/branches/ulif-zawsgi_ftests/src/grokcore/view/ftests/url/url.py	2010-05-25 15:28:14 UTC (rev 112702)
@@ -10,7 +10,7 @@
 
 The views in this test implement self.url():
 
-  >>> from zope.testbrowser.testing import Browser
+  >>> from zope.app.wsgi.testlayer import Browser
   >>> browser = Browser()
   >>> browser.handleErrors = False
   >>> browser.open("http://localhost/herd/manfred/index")

Modified: grokcore.view/branches/ulif-zawsgi_ftests/src/grokcore/view/ftests/url/url_function.py
===================================================================
--- grokcore.view/branches/ulif-zawsgi_ftests/src/grokcore/view/ftests/url/url_function.py	2010-05-25 15:12:30 UTC (rev 112701)
+++ grokcore.view/branches/ulif-zawsgi_ftests/src/grokcore/view/ftests/url/url_function.py	2010-05-25 15:28:14 UTC (rev 112702)
@@ -13,7 +13,7 @@
 
 Now let's use url on some things::
 
-  >>> from zope.testbrowser.testing import Browser
+  >>> from zope.app.wsgi.testlayer import Browser
   >>> browser = Browser()
   >>> browser.handleErrors = False
   >>> browser.open("http://localhost/herd/manfred/index")

Modified: grokcore.view/branches/ulif-zawsgi_ftests/src/grokcore/view/ftests/view/argument.py
===================================================================
--- grokcore.view/branches/ulif-zawsgi_ftests/src/grokcore/view/ftests/view/argument.py	2010-05-25 15:12:30 UTC (rev 112701)
+++ grokcore.view/branches/ulif-zawsgi_ftests/src/grokcore/view/ftests/view/argument.py	2010-05-25 15:28:14 UTC (rev 112702)
@@ -1,7 +1,7 @@
 """
   >>> getRootFolder()["manfred"] = Mammoth()
 
-  >>> from zope.testbrowser.testing import Browser
+  >>> from zope.app.wsgi.testlayer import Browser
   >>> browser = Browser()
   >>> browser.handleErrors = False
 

Modified: grokcore.view/branches/ulif-zawsgi_ftests/src/grokcore/view/ftests/view/index.py
===================================================================
--- grokcore.view/branches/ulif-zawsgi_ftests/src/grokcore/view/ftests/view/index.py	2010-05-25 15:12:30 UTC (rev 112701)
+++ grokcore.view/branches/ulif-zawsgi_ftests/src/grokcore/view/ftests/view/index.py	2010-05-25 15:28:14 UTC (rev 112702)
@@ -3,7 +3,7 @@
 
 The default view name for a model is 'index':
 
-  >>> from zope.testbrowser.testing import Browser
+  >>> from zope.app.wsgi.testlayer import Browser
   >>> browser = Browser()
   >>> browser.handleErrors = False
   >>> browser.open("http://localhost/manfred")

Modified: grokcore.view/branches/ulif-zawsgi_ftests/src/grokcore/view/ftests/view/macros.py
===================================================================
--- grokcore.view/branches/ulif-zawsgi_ftests/src/grokcore/view/ftests/view/macros.py	2010-05-25 15:12:30 UTC (rev 112701)
+++ grokcore.view/branches/ulif-zawsgi_ftests/src/grokcore/view/ftests/view/macros.py	2010-05-25 15:28:14 UTC (rev 112702)
@@ -1,7 +1,7 @@
 """
   >>> getRootFolder()["manfred"] = Mammoth()
 
-  >>> from zope.testbrowser.testing import Browser
+  >>> from zope.app.wsgi.testlayer import Browser
   >>> browser = Browser()
   >>> browser.handleErrors = False
   >>> browser.open("http://localhost/manfred/@@painting")

Modified: grokcore.view/branches/ulif-zawsgi_ftests/src/grokcore/view/ftests/view/skindirective.py
===================================================================
--- grokcore.view/branches/ulif-zawsgi_ftests/src/grokcore/view/ftests/view/skindirective.py	2010-05-25 15:12:30 UTC (rev 112701)
+++ grokcore.view/branches/ulif-zawsgi_ftests/src/grokcore/view/ftests/view/skindirective.py	2010-05-25 15:28:14 UTC (rev 112702)
@@ -1,7 +1,7 @@
 """
   >>> getRootFolder()["manfred"] = Mammoth()
 
-  >>> from zope.testbrowser.testing import Browser
+  >>> from zope.app.wsgi.testlayer import Browser
   >>> browser = Browser()
   >>> browser.handleErrors = False
   >>> browser.open("http://localhost/++skin++casual/manfred/@@hello")

Modified: grokcore.view/branches/ulif-zawsgi_ftests/src/grokcore/view/ftests/view/view.py
===================================================================
--- grokcore.view/branches/ulif-zawsgi_ftests/src/grokcore/view/ftests/view/view.py	2010-05-25 15:12:30 UTC (rev 112701)
+++ grokcore.view/branches/ulif-zawsgi_ftests/src/grokcore/view/ftests/view/view.py	2010-05-25 15:28:14 UTC (rev 112702)
@@ -1,7 +1,7 @@
 """
   >>> getRootFolder()["manfred"] = Mammoth()
 
-  >>> from zope.testbrowser.testing import Browser
+  >>> from zope.app.wsgi.testlayer import Browser
   >>> browser = Browser()
   >>> browser.handleErrors = False
   >>> browser.open("http://localhost/manfred/@@painting")



More information about the checkins mailing list