Commit e9a909e3 authored by Ramiro Morales's avatar Ramiro Morales
Browse files

Fixed #16593 -- Refactored proxy_model_inheritance fixture setup to minimize... 

Fixed #16593 -- Refactored proxy_model_inheritance fixture setup to minimize the chances of leaving a modified INSTALLED_APPS setting for tests ran after it if setUp fails. Thanks Jim Dalton for the report and patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16593 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 27eb8bbf

tests/modeltests/proxy_model_inheritance/tests.py

+8 −7
Original line number Diff line number Diff line
@@ -13,24 +13,25 @@ from django.conf import settings 
from django.core.management import call_command

from django.db.models.loading import load_app

from django.test import TransactionTestCase

from django.test.utils import override_settings



# @override_settings(INSTALLED_APPS=('app1', 'app2'))

class ProxyModelInheritanceTests(TransactionTestCase):



    def setUp(self):

        self.old_sys_path = sys.path[:]

        sys.path.append(os.path.dirname(os.path.abspath(__file__)))

        self.old_installed_apps = settings.INSTALLED_APPS

        settings.INSTALLED_APPS = ('app1', 'app2')

        map(load_app, settings.INSTALLED_APPS)

        call_command('syncdb', verbosity=0)

        global ProxyModel, NiceModel

        from app1.models import ProxyModel

        from app2.models import NiceModel



    def tearDown(self):

        settings.INSTALLED_APPS = self.old_installed_apps

        sys.path = self.old_sys_path



    def test_table_exists(self):

        call_command('syncdb', verbosity=0)

        global ProxyModel, NiceModel

        from app1.models import ProxyModel

        from app2.models import NiceModel

        self.assertEqual(NiceModel.objects.all().count(), 0)

        self.assertEqual(ProxyModel.objects.all().count(), 0)



ProxyModelInheritanceTests = override_settings(INSTALLED_APPS=('app1', 'app2'))(ProxyModelInheritanceTests)