Centralise error handling for commands invoked from error handler (#2436)

1 files changed, 4 insertions, 22 deletions

diff --git a/tests/bot/exts/backend/test_error_handler.py b/tests/bot/exts/backend/test_error_handler.py
index 0ba2fcf11..e28d5cfd0 100644
--- a/tests/bot/exts/backend/test_error_handler.py
+++ b/tests/bot/exts/backend/test_error_handler.py
@@ -54,12 +54,15 @@ class ErrorHandlerTests(unittest.IsolatedAsyncioTestCase):
                 self.ctx.reset_mock()
                 self.cog.try_silence.reset_mock(return_value=True)
                 self.cog.try_get_tag.reset_mock()
+                self.ctx.invoked_from_error_handler = False
 
                 self.cog.try_silence.return_value = case["try_silence_return"]
                 self.ctx.channel.id = 1234
 
                 self.assertIsNone(await self.cog.on_command_error(self.ctx, error))
 
+                self.assertTrue(self.ctx.invoked_from_error_handler)
+
                 if case["try_silence_return"]:
                     self.cog.try_get_tag.assert_not_awaited()
                     self.cog.try_silence.assert_awaited_once()
@@ -203,13 +206,6 @@ class TrySilenceTests(unittest.IsolatedAsyncioTestCase):
         self.ctx = MockContext(bot=self.bot, guild=self.guild)
         self.cog = error_handler.ErrorHandler(self.bot)
 
-    async def test_try_silence_context_invoked_from_error_handler(self):
-        """Should set `Context.invoked_from_error_handler` to `True`."""
-        self.ctx.invoked_with = "foo"
-        await self.cog.try_silence(self.ctx)
-        self.assertTrue(hasattr(self.ctx, "invoked_from_error_handler"))
-        self.assertTrue(self.ctx.invoked_from_error_handler)
-
     async def test_try_silence_get_command(self):
         """Should call `get_command` with `silence`."""
         self.ctx.invoked_with = "foo"
@@ -342,26 +338,12 @@ class TryGetTagTests(unittest.IsolatedAsyncioTestCase):
         await self.cog.try_get_tag(self.ctx)
         self.bot.get_cog.assert_called_once_with("Tags")
 
-    async def test_try_get_tag_invoked_from_error_handler(self):
-        """`self.ctx` should have `invoked_from_error_handler` `True`."""
-        self.ctx.invoked_from_error_handler = False
-        await self.cog.try_get_tag(self.ctx)
-        self.assertTrue(self.ctx.invoked_from_error_handler)
-
     async def test_try_get_tag_no_permissions(self):
         """Test how to handle checks failing."""
         self.bot.can_run = AsyncMock(return_value=False)
         self.ctx.invoked_with = "foo"
         self.assertIsNone(await self.cog.try_get_tag(self.ctx))
 
-    async def test_try_get_tag_command_error(self):
-        """Should call `on_command_error` when `CommandError` raised."""
-        err = errors.CommandError()
-        self.bot.can_run = AsyncMock(side_effect=err)
-        self.cog.on_command_error = AsyncMock()
-        self.assertIsNone(await self.cog.try_get_tag(self.ctx))
-        self.cog.on_command_error.assert_awaited_once_with(self.ctx, err)
-
     async def test_dont_call_suggestion_tag_sent(self):
         """Should never call command suggestion if tag is already sent."""
         self.ctx.message = MagicMock(content="foo")
@@ -375,7 +357,7 @@ class TryGetTagTests(unittest.IsolatedAsyncioTestCase):
     async def test_dont_call_suggestion_if_user_mod(self):
         """Should not call command suggestion if user is a mod."""
         self.ctx.invoked_with = "foo"
-        self.ctx.invoke = AsyncMock(return_value=False)
+        self.tag.get_command_ctx = AsyncMock(return_value=False)
         self.ctx.author.roles = [MockRole(id=1234)]
         self.cog.send_command_suggestion = AsyncMock()