summaryrefslogtreecommitdiff
path: root/tests/regressiontests/app_loading
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/app_loading
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/app_loading')
-rw-r--r--tests/regressiontests/app_loading/tests.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/regressiontests/app_loading/tests.py b/tests/regressiontests/app_loading/tests.py
index 3135f445b8..70c14fdd28 100644
--- a/tests/regressiontests/app_loading/tests.py
+++ b/tests/regressiontests/app_loading/tests.py
@@ -47,28 +47,28 @@ class EggLoadingTest(TestCase):
egg_name = '%s/modelapp.egg' % self.egg_dir
sys.path.append(egg_name)
models = load_app('app_with_models')
- self.failIf(models is None)
+ self.assertFalse(models is None)
def test_egg2(self):
"""Loading an app from an egg that has no models returns no models (and no error)"""
egg_name = '%s/nomodelapp.egg' % self.egg_dir
sys.path.append(egg_name)
models = load_app('app_no_models')
- self.failUnless(models is None)
+ self.assertTrue(models is None)
def test_egg3(self):
"""Models module can be loaded from an app located under an egg's top-level package"""
egg_name = '%s/omelet.egg' % self.egg_dir
sys.path.append(egg_name)
models = load_app('omelet.app_with_models')
- self.failIf(models is None)
+ self.assertFalse(models is None)
def test_egg4(self):
"""Loading an app with no models from under the top-level egg package generates no error"""
egg_name = '%s/omelet.egg' % self.egg_dir
sys.path.append(egg_name)
models = load_app('omelet.app_no_models')
- self.failUnless(models is None)
+ self.assertTrue(models is None)
def test_egg5(self):
"""Loading an app from an egg that has an import error in its models module raises that error"""
@@ -80,4 +80,4 @@ class EggLoadingTest(TestCase):
except ImportError, e:
# Make sure the message is indicating the actual
# problem in the broken app.
- self.failUnless("modelz" in e.args[0])
+ self.assertTrue("modelz" in e.args[0])