move set notfound/forbidden view tests to views

2 files changed, 106 insertions, 105 deletions

diff --git a/pyramid/tests/test_config/test_init.py b/pyramid/tests/test_config/test_init.py
index 1a317128a..cc6b57a87 100644
--- a/pyramid/tests/test_config/test_init.py
+++ b/pyramid/tests/test_config/test_init.py
@@ -777,111 +777,6 @@ pyramid.tests.test_config.dummy_include2""",
         self.assertEqual(config._ctx.actions, [])
         self.assertEqual(config._ctx.info, 'abc')
 
-
-    def test_set_notfound_view(self):
-        from pyramid.renderers import null_renderer
-        from zope.interface import implementedBy
-        from pyramid.interfaces import IRequest
-        from pyramid.httpexceptions import HTTPNotFound
-        config = self._makeOne(autocommit=True)
-        view = lambda *arg: arg
-        config.set_notfound_view(view, renderer=null_renderer)
-        request = self._makeRequest(config)
-        view = self._getViewCallable(config,
-                                     ctx_iface=implementedBy(HTTPNotFound),
-                                     request_iface=IRequest)
-        result = view(None, request)
-        self.assertEqual(result, (None, request))
-
-    def test_set_notfound_view_request_has_context(self):
-        from pyramid.renderers import null_renderer
-        from zope.interface import implementedBy
-        from pyramid.interfaces import IRequest
-        from pyramid.httpexceptions import HTTPNotFound
-        config = self._makeOne(autocommit=True)
-        view = lambda *arg: arg
-        config.set_notfound_view(view, renderer=null_renderer)
-        request = self._makeRequest(config)
-        request.context = 'abc'
-        view = self._getViewCallable(config,
-                                     ctx_iface=implementedBy(HTTPNotFound),
-                                     request_iface=IRequest)
-        result = view(None, request)
-        self.assertEqual(result, ('abc', request))
-
-    @testing.skip_on('java')
-    def test_set_notfound_view_with_renderer(self):
-        from zope.interface import implementedBy
-        from pyramid.interfaces import IRequest
-        from pyramid.httpexceptions import HTTPNotFound
-        config = self._makeOne(autocommit=True)
-        view = lambda *arg: {}
-        config.set_notfound_view(
-            view,
-            renderer='pyramid.tests.test_config:files/minimal.pt')
-        config.begin()
-        try: # chameleon depends on being able to find a threadlocal registry
-            request = self._makeRequest(config)
-            view = self._getViewCallable(config,
-                                         ctx_iface=implementedBy(HTTPNotFound),
-                                         request_iface=IRequest)
-            result = view(None, request)
-        finally:
-            config.end()
-        self.assertTrue('div' in result.body)
-
-    def test_set_forbidden_view(self):
-        from pyramid.renderers import null_renderer
-        from zope.interface import implementedBy
-        from pyramid.interfaces import IRequest
-        from pyramid.httpexceptions import HTTPForbidden
-        config = self._makeOne(autocommit=True)
-        view = lambda *arg: 'OK'
-        config.set_forbidden_view(view, renderer=null_renderer)
-        request = self._makeRequest(config)
-        view = self._getViewCallable(config,
-                                     ctx_iface=implementedBy(HTTPForbidden),
-                                     request_iface=IRequest)
-        result = view(None, request)
-        self.assertEqual(result, 'OK')
-
-    def test_set_forbidden_view_request_has_context(self):
-        from pyramid.renderers import null_renderer
-        from zope.interface import implementedBy
-        from pyramid.interfaces import IRequest
-        from pyramid.httpexceptions import HTTPForbidden
-        config = self._makeOne(autocommit=True)
-        view = lambda *arg: arg
-        config.set_forbidden_view(view, renderer=null_renderer)
-        request = self._makeRequest(config)
-        request.context = 'abc'
-        view = self._getViewCallable(config,
-                                     ctx_iface=implementedBy(HTTPForbidden),
-                                     request_iface=IRequest)
-        result = view(None, request)
-        self.assertEqual(result, ('abc', request))
-
-    @testing.skip_on('java')
-    def test_set_forbidden_view_with_renderer(self):
-        from zope.interface import implementedBy
-        from pyramid.interfaces import IRequest
-        from pyramid.httpexceptions import HTTPForbidden
-        config = self._makeOne(autocommit=True)
-        view = lambda *arg: {}
-        config.set_forbidden_view(
-            view,
-            renderer='pyramid.tests.test_config:files/minimal.pt')
-        config.begin()
-        try: # chameleon requires a threadlocal registry
-            request = self._makeRequest(config)
-            view = self._getViewCallable(config,
-                                         ctx_iface=implementedBy(HTTPForbidden),
-                                         request_iface=IRequest)
-            result = view(None, request)
-        finally:
-            config.end()
-        self.assertTrue('div' in result.body)
-
     def test_set_locale_negotiator(self):
         from pyramid.interfaces import ILocaleNegotiator
         config = self._makeOne(autocommit=True)
diff --git a/pyramid/tests/test_config/test_views.py b/pyramid/tests/test_config/test_views.py
index 8b055e017..7438d2477 100644
--- a/pyramid/tests/test_config/test_views.py
+++ b/pyramid/tests/test_config/test_views.py
@@ -1466,6 +1466,112 @@ class TestViewsConfigurationMixin(unittest.TestCase):
         self.assertEqual(info.added,
                          [('static', static_path, {})])
     
+    def test_set_forbidden_view(self):
+        from pyramid.renderers import null_renderer
+        from zope.interface import implementedBy
+        from pyramid.interfaces import IRequest
+        from pyramid.httpexceptions import HTTPForbidden
+        config = self._makeOne(autocommit=True)
+        view = lambda *arg: 'OK'
+        config.set_forbidden_view(view, renderer=null_renderer)
+        request = self._makeRequest(config)
+        view = self._getViewCallable(config,
+                                     ctx_iface=implementedBy(HTTPForbidden),
+                                     request_iface=IRequest)
+        result = view(None, request)
+        self.assertEqual(result, 'OK')
+
+    def test_set_forbidden_view_request_has_context(self):
+        from pyramid.renderers import null_renderer
+        from zope.interface import implementedBy
+        from pyramid.interfaces import IRequest
+        from pyramid.httpexceptions import HTTPForbidden
+        config = self._makeOne(autocommit=True)
+        view = lambda *arg: arg
+        config.set_forbidden_view(view, renderer=null_renderer)
+        request = self._makeRequest(config)
+        request.context = 'abc'
+        view = self._getViewCallable(config,
+                                     ctx_iface=implementedBy(HTTPForbidden),
+                                     request_iface=IRequest)
+        result = view(None, request)
+        self.assertEqual(result, ('abc', request))
+
+
+
+    def test_set_notfound_view(self):
+        from pyramid.renderers import null_renderer
+        from zope.interface import implementedBy
+        from pyramid.interfaces import IRequest
+        from pyramid.httpexceptions import HTTPNotFound
+        config = self._makeOne(autocommit=True)
+        view = lambda *arg: arg
+        config.set_notfound_view(view, renderer=null_renderer)
+        request = self._makeRequest(config)
+        view = self._getViewCallable(config,
+                                     ctx_iface=implementedBy(HTTPNotFound),
+                                     request_iface=IRequest)
+        result = view(None, request)
+        self.assertEqual(result, (None, request))
+
+    def test_set_notfound_view_request_has_context(self):
+        from pyramid.renderers import null_renderer
+        from zope.interface import implementedBy
+        from pyramid.interfaces import IRequest
+        from pyramid.httpexceptions import HTTPNotFound
+        config = self._makeOne(autocommit=True)
+        view = lambda *arg: arg
+        config.set_notfound_view(view, renderer=null_renderer)
+        request = self._makeRequest(config)
+        request.context = 'abc'
+        view = self._getViewCallable(config,
+                                     ctx_iface=implementedBy(HTTPNotFound),
+                                     request_iface=IRequest)
+        result = view(None, request)
+        self.assertEqual(result, ('abc', request))
+
+    @testing.skip_on('java')
+    def test_set_notfound_view_with_renderer(self):
+        from zope.interface import implementedBy
+        from pyramid.interfaces import IRequest
+        from pyramid.httpexceptions import HTTPNotFound
+        config = self._makeOne(autocommit=True)
+        view = lambda *arg: {}
+        config.set_notfound_view(
+            view,
+            renderer='pyramid.tests.test_config:files/minimal.pt')
+        config.begin()
+        try: # chameleon depends on being able to find a threadlocal registry
+            request = self._makeRequest(config)
+            view = self._getViewCallable(config,
+                                         ctx_iface=implementedBy(HTTPNotFound),
+                                         request_iface=IRequest)
+            result = view(None, request)
+        finally:
+            config.end()
+        self.assertTrue('div' in result.body)
+
+    @testing.skip_on('java')
+    def test_set_forbidden_view_with_renderer(self):
+        from zope.interface import implementedBy
+        from pyramid.interfaces import IRequest
+        from pyramid.httpexceptions import HTTPForbidden
+        config = self._makeOne(autocommit=True)
+        view = lambda *arg: {}
+        config.set_forbidden_view(
+            view,
+            renderer='pyramid.tests.test_config:files/minimal.pt')
+        config.begin()
+        try: # chameleon requires a threadlocal registry
+            request = self._makeRequest(config)
+            view = self._getViewCallable(config,
+                                         ctx_iface=implementedBy(HTTPForbidden),
+                                         request_iface=IRequest)
+            result = view(None, request)
+        finally:
+            config.end()
+        self.assertTrue('div' in result.body)
+
 
 class Test_requestonly(unittest.TestCase):
     def _callFUT(self, view, attr=None):