Commit ad47364d authored by Claude Paroz's avatar Claude Paroz
Browse files

Reverted 905e33f8, now that DatabaseFeatures does not need confirm 

Connection.features does not need to be confirmed any more, after
commit aa423575, rendering obsolete the workaround when using
TEST_MIRROR (Refs #16885, #17760).
parent aa423575

django/test/simple.py

+0 −1
Original line number Diff line number Diff line
@@ -320,7 +320,6 @@ class DjangoTestSuiteRunner(object): 
            mirrors.append((alias, connections[alias].settings_dict['NAME']))

            connections[alias].settings_dict['NAME'] = (

                connections[mirror_alias].settings_dict['NAME'])

            connections[alias].features = connections[mirror_alias].features



        return old_names, mirrors

tests/regressiontests/test_runner/tests.py

+0 −22
Original line number Diff line number Diff line
@@ -204,28 +204,6 @@ class CustomTestRunnerOptionsTests(AdminScriptTestCase): 
        self.assertOutput(out, 'bar:foo:31337')





class Ticket16885RegressionTests(unittest.TestCase):

    def test_ticket_16885(self):

        """Features are also confirmed on mirrored databases."""

        old_db_connections = db.connections

        try:

            db.connections = db.ConnectionHandler({

                'default': {

                    'ENGINE': 'django.db.backends.sqlite3',

                },

                'slave': {

                    'ENGINE': 'django.db.backends.sqlite3',

                    'TEST_MIRROR': 'default',

                },

            })

            slave = db.connections['slave']

            self.assertEqual(slave.features.supports_transactions, None)

            DjangoTestSuiteRunner(verbosity=0).setup_databases()

            self.assertNotEqual(slave.features.supports_transactions, None)

        finally:

            db.connections = old_db_connections





class Ticket17477RegressionTests(AdminScriptTestCase):

    def setUp(self):

        self.write_settings('settings.py')