diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/modeltests/test_client/models.py | 2 | ||||
| -rw-r--r-- | tests/regressiontests/test_client_regress/models.py | 2 | ||||
| -rwxr-xr-x | tests/runtests.py | 7 |
3 files changed, 9 insertions, 2 deletions
diff --git a/tests/modeltests/test_client/models.py b/tests/modeltests/test_client/models.py index 1ba86a4a41..32647552eb 100644 --- a/tests/modeltests/test_client/models.py +++ b/tests/modeltests/test_client/models.py @@ -243,7 +243,7 @@ class ClientTest(TestCase): # Log in login = self.client.login(username='testclient', password='password') - self.assertTrue(login, 'Could not log in') + self.failUnless(login, 'Could not log in') # Request a page that requires a login response = self.client.get('/test_client/login_protected_view/') diff --git a/tests/regressiontests/test_client_regress/models.py b/tests/regressiontests/test_client_regress/models.py index c63dc2b384..60fd909f43 100644 --- a/tests/regressiontests/test_client_regress/models.py +++ b/tests/regressiontests/test_client_regress/models.py @@ -252,7 +252,7 @@ class LoginTests(TestCase): # Create a second client, and log in. c = Client() login = c.login(username='testclient', password='password') - self.assertTrue(login, 'Could not log in') + self.failUnless(login, 'Could not log in') # Get a redirection page with the second client. response = c.get("/test_client_regress/login_protected_redirect_view/") diff --git a/tests/runtests.py b/tests/runtests.py index 85aea50180..5635047381 100755 --- a/tests/runtests.py +++ b/tests/runtests.py @@ -4,6 +4,13 @@ import os, sys, traceback import unittest import django.contrib as contrib + +try: + set +except NameError: + from sets import Set as set # For Python 2.3 + + CONTRIB_DIR_NAME = 'django.contrib' MODEL_TESTS_DIR_NAME = 'modeltests' REGRESSION_TESTS_DIR_NAME = 'regressiontests' |