Skip to content

Commit

Permalink
Fix some old django and py3 compat issues.
Browse files Browse the repository at this point in the history
  • Loading branch information
ionelmc committed Feb 1, 2014
1 parent 25bc11d commit f88e2aa
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
8 changes: 4 additions & 4 deletions tests/test_app/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,31 +35,31 @@ def test_admin_1_root(self):
self.assertRedirects(self.client.get(url.rstrip('/')), url, 301)
response = self.client.get(url)
self.assertEqual(response.status_code, 200, response)
self.assertEqual(response.content, "root", response)
self.assertEqual(response.content, b"root", response)

def test_admin_1_level1(self):
url = reverse('admin:level-1')
self.assertEqual(url, '/admin/test_app/test1/level1/')
self.assertRedirects(self.client.get(url.rstrip('/')), url, 301)
response = self.client.get(url)
self.assertEqual(response.status_code, 200, response)
self.assertEqual(response.content, "level1", response)
self.assertEqual(response.content, b"level1", response)

def test_admin_1_level1_level2(self):
url = reverse('admin:level-2')
self.assertEqual(url, '/admin/test_app/test1/level1/level2/')
self.assertRedirects(self.client.get(url.rstrip('/')), url, 301)
response = self.client.get(url)
self.assertEqual(response.status_code, 200, response)
self.assertEqual(response.content, "level2", response)
self.assertEqual(response.content, b"level2", response)

def test_admin_2_root(self):
url = reverse('admin:test_app_test2_changelist')
self.assertEqual(url, '/admin/test_app/test2/')
self.assertRedirects(self.client.get(url.rstrip('/')), url, 301)
response = self.client.get(url)
self.assertEqual(response.status_code, 200, response)
self.assertEqual(response.content, "root", response)
self.assertEqual(response.content, b"root", response)

def test_runtime_error(self):
from .admin import make_admin_class, patterns, url
Expand Down
2 changes: 0 additions & 2 deletions tests/test_project/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
'django.contrib.contenttypes',
'django.contrib.sessions',
'django.contrib.sites',
'django.contrib.messages',
'django.contrib.staticfiles',
'django.contrib.admin',
'django.contrib.admindocs',
'test_app',
Expand Down

0 comments on commit f88e2aa

Please sign in to comment.