Commit 15fb61c6 authored by Aymeric Augustin's avatar Aymeric Augustin
Browse files

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

[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: http://code.djangoproject.com/svn/django/branches/releases/1.3.X@17806 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 8e733020

tests/regressiontests/app_loading/tests.py

+3 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ import time 


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 @@ class InstalledAppsGlobbingTest(TestCase): 
        sys.path.append(os.path.dirname(os.path.abspath(__file__)))

        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.app', 'parent.app1', 'parent.app_2'])