diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/tests.py | 28 | ||||
| -rw-r--r-- | tests/urls.py | 4 |
2 files changed, 19 insertions, 13 deletions
diff --git a/tests/tests.py b/tests/tests.py index 20b722b..9c5e5a7 100644 --- a/tests/tests.py +++ b/tests/tests.py @@ -20,8 +20,8 @@ from django.utils import six from django.utils import unittest from debug_toolbar.middleware import DebugToolbarMiddleware, show_toolbar -from debug_toolbar.panels.logger import (LoggingPanel, - MESSAGE_IF_STRING_REPRESENTATION_INVALID) +from debug_toolbar.panels.logger import ( + LoggingPanel, MESSAGE_IF_STRING_REPRESENTATION_INVALID) from debug_toolbar.panels.sql import SQLDebugPanel from debug_toolbar.panels.request_vars import RequestVarsDebugPanel from debug_toolbar.panels.template import TemplateDebugPanel @@ -47,7 +47,6 @@ class BaseTestCase(TestCase): self.toolbar.stats = {} - @override_settings(DEBUG=True, INTERNAL_IPS=['127.0.0.1']) class DebugToolbarTestCase(BaseTestCase): @@ -74,8 +73,9 @@ class DebugToolbarTestCase(BaseTestCase): self.assertFalse(isinstance(request.urlconf, six.string_types)) - self.assertTrue(hasattr(request.urlconf.urlpatterns[1], '_callback_str')) - self.assertEqual(request.urlconf.urlpatterns[-1]._callback_str, 'tests.views.execute_sql') + patterns = request.urlconf.urlpatterns + self.assertTrue(hasattr(patterns[1], '_callback_str')) + self.assertEqual(patterns[-1]._callback_str, 'tests.views.execute_sql') def test_request_urlconf_string_per_request(self): request = rf.get('/') @@ -89,8 +89,9 @@ class DebugToolbarTestCase(BaseTestCase): self.assertFalse(isinstance(request.urlconf, six.string_types)) - self.assertTrue(hasattr(request.urlconf.urlpatterns[1], '_callback_str')) - self.assertEqual(request.urlconf.urlpatterns[-1]._callback_str, 'tests.views.execute_sql') + patterns = request.urlconf.urlpatterns + self.assertTrue(hasattr(patterns[1], '_callback_str')) + self.assertEqual(patterns[-1]._callback_str, 'tests.views.execute_sql') def test_request_urlconf_module(self): request = rf.get('/') @@ -102,8 +103,9 @@ class DebugToolbarTestCase(BaseTestCase): self.assertFalse(isinstance(request.urlconf, six.string_types)) - self.assertTrue(hasattr(request.urlconf.urlpatterns[1], '_callback_str')) - self.assertEqual(request.urlconf.urlpatterns[-1]._callback_str, 'tests.views.execute_sql') + patterns = request.urlconf.urlpatterns + self.assertTrue(hasattr(patterns[1], '_callback_str')) + self.assertEqual(patterns[-1]._callback_str, 'tests.views.execute_sql') def test_tuple_urlconf(self): request = rf.get('/') @@ -191,8 +193,11 @@ class DebugToolbarIntegrationTestCase(TestCase): ET.fromstring(response.content) # shouldn't raise ParseError def test_view_executed_once(self): - with self.settings(DEBUG=True, INTERNAL_IPS=['127.0.0.1'], + with self.settings( + DEBUG=True, + INTERNAL_IPS=['127.0.0.1'], DEBUG_TOOLBAR_PANELS=['debug_toolbar.panels.profiling.ProfilingDebugPanel']): + self.assertEqual(User.objects.count(), 0) response = self.client.get('/new_user/') @@ -207,6 +212,7 @@ class DebugToolbarIntegrationTestCase(TestCase): response = self.client.get('/new_user/') self.assertEqual(User.objects.count(), 1) + class DebugToolbarNameFromObjectTest(BaseTestCase): def test_func(self): @@ -257,7 +263,7 @@ class SQLPanelTestCase(BaseTestCase): list(User.objects.filter(username='café')) self.assertEqual(len(panel._queries), 2) - @unittest.skipUnless(connection.vendor=='postgresql', + @unittest.skipUnless(connection.vendor == 'postgresql', 'Test valid only on PostgreSQL') def test_erroneous_query(self): """ diff --git a/tests/urls.py b/tests/urls.py index 8f14a2d..93e77c4 100644 --- a/tests/urls.py +++ b/tests/urls.py @@ -10,11 +10,11 @@ from .models import NonAsciiRepr admin.autodiscover() -urlpatterns = patterns('tests.views', +urlpatterns = patterns('tests.views', # noqa url(r'^set_session/$', 'set_session'), url(r'^resolving1/(.+)/(.+)/$', 'resolving_view', name='positional-resolving'), url(r'^resolving2/(?P<arg1>.+)/(?P<arg2>.+)/$', 'resolving_view'), - url(r'^resolving3/(.+)/$', 'resolving_view', { 'arg2' : 'default' }), + url(r'^resolving3/(.+)/$', 'resolving_view', {'arg2': 'default'}), url(r'^regular/(?P<title>.*)/$', 'regular_view'), url(r'^non_ascii_context/$', 'non_ascii_context'), url(r'^non_ascii_bytes_in_db_params/$', 'new_user', {'username': 'djàngó'.encode('utf-8')}), |