summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2012-06-09 17:05:54 +0200
committerClaude Paroz <claude@2xlibre.net>2012-06-09 17:05:54 +0200
commitad47364dd324508e8332ea853da59772431398aa (patch)
treef28a989e8dbbecf7fd0f8cd8a1b743983699aecb
parentaa423575e7b464433fcfc4bf4b8e1d7627b17ce6 (diff)
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 #16885, #17760).
-rw-r--r--django/test/simple.py1
-rw-r--r--tests/regressiontests/test_runner/tests.py22
2 files changed, 0 insertions, 23 deletions
diff --git a/django/test/simple.py b/django/test/simple.py
index 62e7326295..4f05284543 100644
--- a/django/test/simple.py
+++ b/django/test/simple.py
@@ -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
diff --git a/tests/regressiontests/test_runner/tests.py b/tests/regressiontests/test_runner/tests.py
index 05f99105aa..89182872bd 100644
--- a/tests/regressiontests/test_runner/tests.py
+++ b/tests/regressiontests/test_runner/tests.py
@@ -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')