[1.10.x] Replaced use of TestCase.fail() with assertRaises().

Also removed try/except/fail antipattern that hides exceptions.

Backport of c9ae09addffb839403312131d4251e9d8b454508 from master

1 files changed, 5 insertions, 16 deletions

diff --git a/tests/test_runner/tests.py b/tests/test_runner/tests.py
index fd0b895789..7fa54f0d87 100644
--- a/tests/test_runner/tests.py
+++ b/tests/test_runner/tests.py
@@ -240,12 +240,8 @@ class DummyBackendTest(unittest.TestCase):
         tested_connections = db.ConnectionHandler({})
         with mock.patch('django.test.runner.connections', new=tested_connections):
             runner_instance = DiscoverRunner(verbosity=0)
-            try:
-                old_config = runner_instance.setup_databases()
-                runner_instance.teardown_databases(old_config)
-            except Exception as e:
-                self.fail("setup_databases/teardown_databases unexpectedly raised "
-                          "an error: %s" % e)
+            old_config = runner_instance.setup_databases()
+            runner_instance.teardown_databases(old_config)
 
 
 class AliasedDefaultTestSetupTest(unittest.TestCase):
@@ -263,12 +259,8 @@ class AliasedDefaultTestSetupTest(unittest.TestCase):
         })
         with mock.patch('django.test.runner.connections', new=tested_connections):
             runner_instance = DiscoverRunner(verbosity=0)
-            try:
-                old_config = runner_instance.setup_databases()
-                runner_instance.teardown_databases(old_config)
-            except Exception as e:
-                self.fail("setup_databases/teardown_databases unexpectedly raised "
-                          "an error: %s" % e)
+            old_config = runner_instance.setup_databases()
+            runner_instance.teardown_databases(old_config)
 
 
 class SetupDatabasesTests(unittest.TestCase):
@@ -366,7 +358,4 @@ class EmptyDefaultDatabaseTest(unittest.TestCase):
         testcases.connections = db.ConnectionHandler({'default': {}})
         connection = testcases.connections[db.utils.DEFAULT_DB_ALIAS]
         self.assertEqual(connection.settings_dict['ENGINE'], 'django.db.backends.dummy')
-        try:
-            connections_support_transactions()
-        except Exception as e:
-            self.fail("connections_support_transactions() unexpectedly raised an error: %s" % e)
+        connections_support_transactions()