summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-09-24 12:33:31 -0400
committerChris McDonough <chrism@plope.com>2011-09-24 12:33:31 -0400
commit7950a27d0ec4c50e7a722feee2f97ca08949b14b (patch)
tree3614af3abc7cc65ae5a82ac63ef5db407fe9fbc5
parent105cb1123ca93dd25f0a6a22aa0e7288155f404c (diff)
downloadpyramid-7950a27d0ec4c50e7a722feee2f97ca08949b14b.tar.gz
pyramid-7950a27d0ec4c50e7a722feee2f97ca08949b14b.tar.bz2
pyramid-7950a27d0ec4c50e7a722feee2f97ca08949b14b.zip
protect against webob repr changes
-rw-r--r--pyramid/tests/test_router.py9
1 files changed, 3 insertions, 6 deletions
diff --git a/pyramid/tests/test_router.py b/pyramid/tests/test_router.py
index 7ba4d5722..eb9b7285d 100644
--- a/pyramid/tests/test_router.py
+++ b/pyramid/tests/test_router.py
@@ -269,15 +269,14 @@ class TestRouter(unittest.TestCase):
start_response = DummyStartResponse()
why = exc_raised(HTTPNotFound, router, environ, start_response)
self.assertTrue(
- "debug_notfound of url http://localhost:8080/; path_info: '/', "
- "context:" in why.args[0])
+ "debug_notfound of url http://localhost:8080/; " in why.args[0])
self.assertTrue("view_name: '', subpath: []" in why.args[0])
self.assertTrue('http://localhost:8080' in why.args[0], why)
self.assertEqual(len(logger.messages), 1)
message = logger.messages[0]
self.assertTrue('of url http://localhost:8080' in message)
- self.assertTrue("path_info: '/'" in message)
+ self.assertTrue("path_info: " in message)
self.assertTrue('DummyContext' in message)
self.assertTrue("view_name: ''" in message)
self.assertTrue("subpath: []" in message)
@@ -651,15 +650,13 @@ class TestRouter(unittest.TestCase):
self.assertEqual(environ['bfg.routes.route'].name, 'foo')
self.assertEqual(request.matchdict, matchdict)
self.assertEqual(request.matched_route.name, 'foo')
-
self.assertEqual(len(logger.messages), 1)
self.assertTrue(
logger.messages[0].startswith(
"route matched for url http://localhost:8080"
"/archives/action1/article1; "
"route_name: 'foo', "
- "path_info: '/archives/action1/article1', "
- "pattern: 'archives/:action/:article', "))
+ "path_info: "))
def test_call_route_match_miss_debug_routematch(self):
from pyramid.httpexceptions import HTTPNotFound