Browse files

[1.3.X] Avoided a test failure if the settings module used to run the…

… test suite is called "test_settings".

The globbing feature and this test were removed in 1.4.

git-svn-id: bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent 8e73302 commit 15fb61c62ce403bc2ba7f63c5f519a988ce2c5d2 @aaugustin aaugustin committed Mar 24, 2012
Showing with 3 additions and 1 deletion.
  1. +3 −1 tests/regressiontests/app_loading/
@@ -5,7 +5,7 @@
from django.conf import Settings
from django.db.models.loading import cache, load_app
-from django.utils.unittest import TestCase
+from django.utils.unittest import TestCase, skipIf
class InstalledAppsGlobbingTest(TestCase):
@@ -14,6 +14,8 @@ def setUp(self):
self.OLD_TZ = os.environ.get("TZ")
+ @skipIf('test_settings' in sys.modules,
+ 'A toplevel module named test_settings already exists')
def test_globbing(self):
settings = Settings('test_settings')
self.assertEqual(settings.INSTALLED_APPS, ['', 'parent.app1', 'parent.app_2'])

0 comments on commit 15fb61c

Please sign in to comment.