rely on webob for request.path_info and request.scheme

2 files changed, 13 insertions, 7 deletions

diff --git a/tests/test_config/test_testing.py b/tests/test_config/test_testing.py
index ede31e1b6..870bbe9fa 100644
--- a/tests/test_config/test_testing.py
+++ b/tests/test_config/test_testing.py
@@ -69,23 +69,27 @@ class TestingConfiguratorMixinTests(unittest.TestCase):
         config = self._makeOne(autocommit=True)
         config.testing_resources(resources)
         adapter = config.registry.getAdapter(None, ITraverser)
-        result = adapter(DummyRequest({'PATH_INFO': '/ob1'}))
+        request = DummyRequest()
+        request.path_info = '/ob1'
+        result = adapter(request)
         self.assertEqual(result['context'], ob1)
         self.assertEqual(result['view_name'], '')
         self.assertEqual(result['subpath'], ())
         self.assertEqual(result['traversed'], (text_('ob1'),))
         self.assertEqual(result['virtual_root'], ob1)
         self.assertEqual(result['virtual_root_path'], ())
-        result = adapter(DummyRequest({'PATH_INFO': '/ob2'}))
+        request = DummyRequest()
+        request.path_info = '/ob2'
+        result = adapter(request)
         self.assertEqual(result['context'], ob2)
         self.assertEqual(result['view_name'], '')
         self.assertEqual(result['subpath'], ())
         self.assertEqual(result['traversed'], (text_('ob2'),))
         self.assertEqual(result['virtual_root'], ob2)
         self.assertEqual(result['virtual_root_path'], ())
-        self.assertRaises(
-            KeyError, adapter, DummyRequest({'PATH_INFO': '/ob3'})
-        )
+        request = DummyRequest()
+        request.path_info = '/ob3'
+        self.assertRaises(KeyError, adapter, request)
         try:
             config.begin()
             self.assertEqual(find_resource(None, '/ob1'), ob1)
diff --git a/tests/test_config/test_views.py b/tests/test_config/test_views.py
index d530542b7..e25ee881e 100644
--- a/tests/test_config/test_views.py
+++ b/tests/test_config/test_views.py
@@ -1357,6 +1357,7 @@ class TestViewsConfigurationMixin(unittest.TestCase):
             request_method='POST',
         )
         request = self._makeRequest(config)
+        request.path_info = '/'
         request.method = 'POST'
         request.params = {}
         router = Router(config.registry)
@@ -1412,6 +1413,7 @@ class TestViewsConfigurationMixin(unittest.TestCase):
             request_method='POST',
         )
         request = self._makeRequest(config)
+        request.path_info = '/'
         request.method = 'POST'
         request.params = {}
         router = Router(config.registry)
@@ -2722,7 +2724,7 @@ class TestViewsConfigurationMixin(unittest.TestCase):
             view, renderer=null_renderer, append_slash=True
         )
         request = self._makeRequest(config)
-        request.environ['PATH_INFO'] = '/foo'
+        request.path_info = '/foo'
         request.query_string = 'a=1&b=2'
         request.path = '/scriptname/foo'
         view = self._getViewCallable(
@@ -2751,7 +2753,7 @@ class TestViewsConfigurationMixin(unittest.TestCase):
             view, renderer=null_renderer, append_slash=HTTPMovedPermanently
         )
         request = self._makeRequest(config)
-        request.environ['PATH_INFO'] = '/foo'
+        request.path_info = '/foo'
         request.query_string = 'a=1&b=2'
         request.path = '/scriptname/foo'
         view = self._getViewCallable(