Commit 0df4c1c4 authored by Alex Gaynor's avatar Alex Gaynor
Browse files

[1.2.X] Ensure the mutliple_database tests leave the settings in the same... 

[1.2.X] Ensure the mutliple_database tests leave the settings in the same state they found them.  Backport of [14313].

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14314 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent b855dbf6

tests/regressiontests/multiple_database/tests.py

+6 −2
Original line number Diff line number Diff line
@@ -1547,12 +1547,16 @@ class AuthTestCase(TestCase): 
        command_output = new_io.getvalue().strip()

        self.assertTrue('"email": "alice@example.com",' in command_output)



_missing = object()

class UserProfileTestCase(TestCase):

    def setUp(self):

        self.old_auth_profile_module = getattr(settings, 'AUTH_PROFILE_MODULE', None)

        self.old_auth_profile_module = getattr(settings, 'AUTH_PROFILE_MODULE', _missing)

        settings.AUTH_PROFILE_MODULE = 'multiple_database.UserProfile'



    def tearDown(self):

        if self.old_auth_profile_module is _missing:

            del settings.AUTH_PROFILE_MODULE

        else:

            settings.AUTH_PROFILE_MODULE = self.old_auth_profile_module



    def test_user_profiles(self):