summaryrefslogtreecommitdiff
path: root/tests/app_loading
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2014-01-05 10:12:56 +0100
committerAymeric Augustin <aymeric.augustin@m4x.org>2014-01-05 20:52:46 +0100
commit5d9da7597ebae302ba15c0ee85aaece80a6d4926 (patch)
tree0b4b26aa6fdd8602476c7f590350ee42e727c835 /tests/app_loading
parentd4b059d3eb2850f43a06162c8316777cb1681d7b (diff)
downloaddjango-5d9da7597ebae302ba15c0ee85aaece80a6d4926.tar.gz
Fixed app registry cleanup in app-loading tests.
Diffstat (limited to 'tests/app_loading')
-rw-r--r--tests/app_loading/tests.py10
1 files changed, 4 insertions, 6 deletions
diff --git a/tests/app_loading/tests.py b/tests/app_loading/tests.py
index 46c5955c53..63f47fa5fa 100644
--- a/tests/app_loading/tests.py
+++ b/tests/app_loading/tests.py
@@ -15,14 +15,8 @@ class EggLoadingTest(TestCase):
self.old_path = sys.path[:]
self.egg_dir = '%s/eggs' % os.path.dirname(upath(__file__))
- # The models need to be removed after the test in order to prevent bad
- # interactions with the flush operation in other tests.
- self._old_models = apps.all_models['app_loading'].copy()
-
def tearDown(self):
- apps.all_models['app_loading'] = self._old_models
apps.clear_cache()
-
sys.path = self.old_path
def test_egg1(self):
@@ -32,6 +26,7 @@ class EggLoadingTest(TestCase):
with self.settings(INSTALLED_APPS=['app_with_models']):
models_module = apps.get_app_config('app_with_models').models_module
self.assertIsNotNone(models_module)
+ del apps.all_models['app_with_models']
def test_egg2(self):
"""Loading an app from an egg that has no models returns no models (and no error)"""
@@ -40,6 +35,7 @@ class EggLoadingTest(TestCase):
with self.settings(INSTALLED_APPS=['app_no_models']):
models_module = apps.get_app_config('app_no_models').models_module
self.assertIsNone(models_module)
+ del apps.all_models['app_no_models']
def test_egg3(self):
"""Models module can be loaded from an app located under an egg's top-level package"""
@@ -48,6 +44,7 @@ class EggLoadingTest(TestCase):
with self.settings(INSTALLED_APPS=['omelet.app_with_models']):
models_module = apps.get_app_config('app_with_models').models_module
self.assertIsNotNone(models_module)
+ del apps.all_models['app_with_models']
def test_egg4(self):
"""Loading an app with no models from under the top-level egg package generates no error"""
@@ -56,6 +53,7 @@ class EggLoadingTest(TestCase):
with self.settings(INSTALLED_APPS=['omelet.app_no_models']):
models_module = apps.get_app_config('app_no_models').models_module
self.assertIsNone(models_module)
+ del apps.all_models['app_no_models']
def test_egg5(self):
"""Loading an app from an egg that has an import error in its models module raises that error"""