summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorJannis Leidel <jannis@leidel.info>2011-06-14 10:35:13 +0000
committerJannis Leidel <jannis@leidel.info>2011-06-14 10:35:13 +0000
commit3d970762af059656aba487d3ff4281adf578130f (patch)
tree25220f7475309ff8155e1ea1421130e30c4ae870 /tests
parentb5e7eab9fddb981e0e20a663c76604e7d0c9a42a (diff)
Fixed naming of test methods for the sake of consistency.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16399 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'tests')
-rw-r--r--tests/regressiontests/settings_tests/tests.py6
-rw-r--r--tests/regressiontests/views/tests/debug.py6
2 files changed, 6 insertions, 6 deletions
diff --git a/tests/regressiontests/settings_tests/tests.py b/tests/regressiontests/settings_tests/tests.py
index a04f8e3556..ad42e1a5f2 100644
--- a/tests/regressiontests/settings_tests/tests.py
+++ b/tests/regressiontests/settings_tests/tests.py
@@ -194,7 +194,7 @@ class EnvironmentVariableTest(TestCase):
# expect default
setup_environ(global_settings)
- self.assertEquals(
+ self.assertEqual(
os.environ.get('DJANGO_SETTINGS_MODULE'),
original_module
)
@@ -203,7 +203,7 @@ class EnvironmentVariableTest(TestCase):
os.environ['DJANGO_SETTINGS_MODULE'] = user_override
setup_environ(global_settings)
- self.assertEquals(
+ self.assertEqual(
os.environ.get('DJANGO_SETTINGS_MODULE'),
user_override
)
@@ -212,7 +212,7 @@ class EnvironmentVariableTest(TestCase):
os.environ['DJANGO_SETTINGS_MODULE'] = user_override
setup_environ(global_settings, original_settings_path = orig_path)
- self.assertEquals(
+ self.assertEqual(
os.environ.get('DJANGO_SETTINGS_MODULE'),
orig_path
)
diff --git a/tests/regressiontests/views/tests/debug.py b/tests/regressiontests/views/tests/debug.py
index 1dbaff490f..79af253d7c 100644
--- a/tests/regressiontests/views/tests/debug.py
+++ b/tests/regressiontests/views/tests/debug.py
@@ -224,7 +224,7 @@ class ExceptionReporterFilterTests(TestCase):
mail.outbox = [] # Empty outbox
request = self.rf.post('/some_url/', self.breakfast_data)
response = view(request)
- self.assertEquals(len(mail.outbox), 1)
+ self.assertEqual(len(mail.outbox), 1)
email = mail.outbox[0]
# Frames vars are never shown in plain text email reports.
self.assertNotIn('cooked_eggs', email.body)
@@ -244,7 +244,7 @@ class ExceptionReporterFilterTests(TestCase):
mail.outbox = [] # Empty outbox
request = self.rf.post('/some_url/', self.breakfast_data)
response = view(request)
- self.assertEquals(len(mail.outbox), 1)
+ self.assertEqual(len(mail.outbox), 1)
email = mail.outbox[0]
# Frames vars are never shown in plain text email reports.
self.assertNotIn('cooked_eggs', email.body)
@@ -269,7 +269,7 @@ class ExceptionReporterFilterTests(TestCase):
mail.outbox = [] # Empty outbox
request = self.rf.post('/some_url/', self.breakfast_data)
response = view(request)
- self.assertEquals(len(mail.outbox), 1)
+ self.assertEqual(len(mail.outbox), 1)
email = mail.outbox[0]
# Frames vars are never shown in plain text email reports.
self.assertNotIn('cooked_eggs', email.body)