lint: broad-exception-raised

Mostly pretty lazy fixes. Most of the places in the tests we were
already matching on error message, a couple of places we weren't. The
tick-tock one was the only one that wasn't being used right where it was
raised.

Some of them I just changed to RuntimeError because it was shorter than
adding the pylint directive.

6 files changed, 14 insertions, 10 deletions

diff --git a/tests/unit/browser/test_history.py b/tests/unit/browser/test_history.py
index 51a9effb8..268f21a08 100644
--- a/tests/unit/browser/test_history.py
+++ b/tests/unit/browser/test_history.py
@@ -471,7 +471,7 @@ class TestRebuild:
         # Trigger a completion rebuild
         monkeypatch.setattr(web_history.database, 'user_version_changed', lambda: True)
 
-        with pytest.raises(Exception, match='tick-tock'):
+        with pytest.raises(stubs.FakeHistoryTick, match='tick-tock'):
             history.WebHistory(web_history.database, progress=progress)
 
         assert web_history.metainfo['force_rebuild']
diff --git a/tests/unit/components/test_misccommands.py b/tests/unit/components/test_misccommands.py
index 342b39f64..3a4118fb4 100644
--- a/tests/unit/components/test_misccommands.py
+++ b/tests/unit/components/test_misccommands.py
@@ -78,7 +78,7 @@ def test_debug_trace_exception(mocker):
     """Check that exceptions thrown by hunter.trace are handled."""
     def _mock_exception():
         """Side effect for testing debug_trace's reraise."""
-        raise Exception('message')
+        raise Exception('message')  # pylint: disable=broad-exception-raised
 
     hunter_mock = mocker.patch.object(misccommands, 'hunter')
     hunter_mock.trace.side_effect = _mock_exception
diff --git a/tests/unit/extensions/test_loader.py b/tests/unit/extensions/test_loader.py
index e9b8055aa..488c3edc2 100644
--- a/tests/unit/extensions/test_loader.py
+++ b/tests/unit/extensions/test_loader.py
@@ -91,7 +91,7 @@ class _Hook:
 
     def __call__(self, *args):
         if self.raising:
-            raise Exception("Should not be called!")
+            raise AssertionError("Should not be called!")
         self.called = True
 
 
diff --git a/tests/unit/misc/test_ipc.py b/tests/unit/misc/test_ipc.py
index 51d7c6343..eea4f9bb5 100644
--- a/tests/unit/misc/test_ipc.py
+++ b/tests/unit/misc/test_ipc.py
@@ -262,7 +262,7 @@ class TestSocketName:
         elif utils.is_linux:
             pass
         else:
-            raise Exception("Unexpected platform!")
+            raise AssertionError("Unexpected platform!")
 
 
 class TestExceptions:
diff --git a/tests/unit/misc/test_sql.py b/tests/unit/misc/test_sql.py
index 80ab7513c..42207177e 100644
--- a/tests/unit/misc/test_sql.py
+++ b/tests/unit/misc/test_sql.py
@@ -406,7 +406,9 @@ class TestTransaction:
             with database.transaction():
                 my_table.insert({'column': 1})
                 my_table.insert({'column': 2})
-                raise Exception('something went horribly wrong')
-        except Exception:
+                raise RuntimeError(
+                    'something went horribly wrong and the transaction will be aborted'
+                )
+        except RuntimeError:
             pass
         assert database.query('select count(*) from my_table').run().value() == 0
diff --git a/tests/unit/utils/test_utils.py b/tests/unit/utils/test_utils.py
index aa063b7c6..4f81783c2 100644
--- a/tests/unit/utils/test_utils.py
+++ b/tests/unit/utils/test_utils.py
@@ -425,7 +425,7 @@ class TestPreventExceptions:
 
     @utils.prevent_exceptions(42)
     def func_raising(self):
-        raise Exception
+        raise RuntimeError("something went wrong")
 
     def test_raising(self, caplog):
         """Test with a raising function."""
@@ -434,6 +434,7 @@ class TestPreventExceptions:
         assert ret == 42
         expected = 'Error in test_utils.TestPreventExceptions.func_raising'
         assert caplog.messages == [expected]
+        assert caplog.records[0].exc_info[1].args[0] == "something went wrong"
 
     @utils.prevent_exceptions(42)
     def func_not_raising(self):
@@ -448,7 +449,7 @@ class TestPreventExceptions:
 
     @utils.prevent_exceptions(42, True)
     def func_predicate_true(self):
-        raise Exception("its-true")
+        raise RuntimeError("its-true")
 
     def test_predicate_true(self, caplog):
         """Test with a True predicate."""
@@ -456,15 +457,16 @@ class TestPreventExceptions:
             ret = self.func_predicate_true()
         assert ret == 42
         assert len(caplog.records) == 1
+        assert caplog.records[0].exc_info[1].args[0] == "its-true"
 
     @utils.prevent_exceptions(42, False)
     def func_predicate_false(self):
-        raise Exception("its-false")
+        raise RuntimeError("its-false")
 
     def test_predicate_false(self, caplog):
         """Test with a False predicate."""
         with caplog.at_level(logging.ERROR, 'misc'):
-            with pytest.raises(Exception, match="its-false"):
+            with pytest.raises(RuntimeError, match="its-false"):
                 self.func_predicate_false()
         assert not caplog.records