summaryrefslogtreecommitdiff
path: root/tests/regressiontests/admin_scripts
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2010-12-04 07:28:12 +0000
committerAlex Gaynor <alex.gaynor@gmail.com>2010-12-04 07:28:12 +0000
commit5bc0ec4ec4b7c888a291bc81b2edd72812231d96 (patch)
treebf3bec9ab44f1847ed2076167039e763011ea1cd /tests/regressiontests/admin_scripts
parent6770c3626271569da41053c1cfd37f7128f1457f (diff)
Removed all usages of deprecated TestCase methods (self.fail*). This removed most of the Warnings emitted (with -Wall) during the test suite.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14803 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'tests/regressiontests/admin_scripts')
-rw-r--r--tests/regressiontests/admin_scripts/tests.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/regressiontests/admin_scripts/tests.py b/tests/regressiontests/admin_scripts/tests.py
index 52f1bedc44..bc79f08ed8 100644
--- a/tests/regressiontests/admin_scripts/tests.py
+++ b/tests/regressiontests/admin_scripts/tests.py
@@ -12,6 +12,7 @@ from django import conf, bin, get_version
from django.conf import settings
from django.utils import unittest
+
class AdminScriptTestCase(unittest.TestCase):
def write_settings(self, filename, apps=None, is_dir=False, sdict=None):
test_dir = os.path.dirname(os.path.dirname(__file__))
@@ -156,7 +157,7 @@ class AdminScriptTestCase(unittest.TestCase):
self.assertEquals(len(stream), 0, "Stream should be empty: actually contains '%s'" % stream)
def assertOutput(self, stream, msg):
"Utility assertion: assert that the given message exists in the output"
- self.failUnless(msg in stream, "'%s' does not match actual output text '%s'" % (msg, stream))
+ self.assertTrue(msg in stream, "'%s' does not match actual output text '%s'" % (msg, stream))
##########################################################################
# DJANGO ADMIN TESTS