diff options
| author | David Cramer | 2011-05-26 02:36:01 -0700 |
|---|---|---|
| committer | David Cramer | 2011-05-26 02:36:01 -0700 |
| commit | 2d3b5bab07cf441dbbf1710418d2d510089f0243 (patch) | |
| tree | 8f17a2734804d4a9353d7f8284f9c05560ee0d5b | |
| parent | eb5fecd3fe9db5d69d1fa24723235c2d4b356b28 (diff) | |
| download | django-debug-toolbar-2d3b5bab07cf441dbbf1710418d2d510089f0243.tar.bz2 | |
Update tests to match new behavior
| -rw-r--r-- | debug_toolbar/tests/tests.py | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/debug_toolbar/tests/tests.py b/debug_toolbar/tests/tests.py index 54a99d5..355244b 100644 --- a/debug_toolbar/tests/tests.py +++ b/debug_toolbar/tests/tests.py @@ -94,10 +94,11 @@ class DebugToolbarTestCase(BaseTestCase): with Settings(DEBUG=True): middleware.process_request(request) - urls = getattr(__import__(request.urlconf), request.urlconf.rsplit('.', 1)[-1]) + self.assertFalse(isinstance(request.urlconf, basestring)) - self.assertEquals(urls.urlpatterns[0]._callback_str, 'debug_toolbar.views.debug_media') - self.assertEquals(urls.urlpatterns[-1].urlconf_name.__name__, 'debug_toolbar.tests.urls') + self.assertTrue(hasattr(request.urlconf.urlpatterns[0], '_callback_str')) + self.assertEquals(request.urlconf.urlpatterns[0]._callback_str, 'debug_toolbar.views.debug_media') + self.assertEquals(request.urlconf.urlpatterns[-1].urlconf_name.__name__, 'debug_toolbar.tests.urls') def test_request_urlconf_string_per_request(self): request = self.request @@ -111,10 +112,12 @@ class DebugToolbarTestCase(BaseTestCase): request.urlconf = 'debug_toolbar.urls' middleware.process_request(request) - urls = getattr(__import__(request.urlconf), request.urlconf.rsplit('.', 1)[-1]) + self.assertFalse(isinstance(request.urlconf, basestring)) - self.assertEquals(urls.urlpatterns[0]._callback_str, 'debug_toolbar.views.debug_media') - self.assertEquals(urls.urlpatterns[-1].urlconf_name.__name__, 'debug_toolbar.urls') + self.assertTrue(hasattr(request.urlconf.urlpatterns[0], '_callback_str')) + self.assertEquals(request.urlconf.urlpatterns[0]._callback_str, 'debug_toolbar.views.debug_media') + self.assertEquals(request.urlconf.urlpatterns[-1].urlconf_name.__name__, 'debug_toolbar.urls') + class SQLPanelTestCase(BaseTestCase): def test_recording(self): |