Skip to content

Commit ad47364

Browse files
committed
Reverted 905e33f, now that DatabaseFeatures does not need confirm
Connection.features does not need to be confirmed any more, after commit aa42357, rendering obsolete the workaround when using TEST_MIRROR (Refs django#16885, django#17760).
1 parent aa42357 commit ad47364

File tree

2 files changed

+0
-23
lines changed

2 files changed

+0
-23
lines changed

django/test/simple.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,6 @@ def setup_databases(self, **kwargs):
320320
mirrors.append((alias, connections[alias].settings_dict['NAME']))
321321
connections[alias].settings_dict['NAME'] = (
322322
connections[mirror_alias].settings_dict['NAME'])
323-
connections[alias].features = connections[mirror_alias].features
324323

325324
return old_names, mirrors
326325

tests/regressiontests/test_runner/tests.py

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -204,28 +204,6 @@ def test_all_options_given(self):
204204
self.assertOutput(out, 'bar:foo:31337')
205205

206206

207-
class Ticket16885RegressionTests(unittest.TestCase):
208-
def test_ticket_16885(self):
209-
"""Features are also confirmed on mirrored databases."""
210-
old_db_connections = db.connections
211-
try:
212-
db.connections = db.ConnectionHandler({
213-
'default': {
214-
'ENGINE': 'django.db.backends.sqlite3',
215-
},
216-
'slave': {
217-
'ENGINE': 'django.db.backends.sqlite3',
218-
'TEST_MIRROR': 'default',
219-
},
220-
})
221-
slave = db.connections['slave']
222-
self.assertEqual(slave.features.supports_transactions, None)
223-
DjangoTestSuiteRunner(verbosity=0).setup_databases()
224-
self.assertNotEqual(slave.features.supports_transactions, None)
225-
finally:
226-
db.connections = old_db_connections
227-
228-
229207
class Ticket17477RegressionTests(AdminScriptTestCase):
230208
def setUp(self):
231209
self.write_settings('settings.py')

0 commit comments

Comments
 (0)