diff options
Diffstat (limited to 'tests/regressiontests/app_loading')
| -rw-r--r-- | tests/regressiontests/app_loading/tests.py | 10 |
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]) |