aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorGravatar Jannes Jonkers <[email protected]>2020-05-11 20:58:51 +0200
committerGravatar Jannes Jonkers <[email protected]>2020-05-11 20:58:51 +0200
commitfa467e4ef133186ff462b0178bcab08e8a3d6b2d (patch)
tree2d9dc21cfafcfdf2f5b2c217c28e151462dde7d5 /tests
parentAntiMalware Tests - added a missing case for no extensions in test_get_disall... (diff)
AntiMalware Tests - Removed exact log content checks
Diffstat (limited to 'tests')
-rw-r--r--tests/bot/cogs/test_antimalware.py21
1 files changed, 2 insertions, 19 deletions
diff --git a/tests/bot/cogs/test_antimalware.py b/tests/bot/cogs/test_antimalware.py
index 7caee6f3c..a2ce9a740 100644
--- a/tests/bot/cogs/test_antimalware.py
+++ b/tests/bot/cogs/test_antimalware.py
@@ -1,5 +1,4 @@
import unittest
-from os.path import splitext
from unittest.mock import AsyncMock, Mock
from discord import NotFound
@@ -108,33 +107,17 @@ class AntiMalwareCogTests(unittest.IsolatedAsyncioTestCase):
self.message.attachments = [attachment]
self.message.delete = AsyncMock(side_effect=NotFound(response=Mock(status=""), message=""))
- with self.assertLogs(logger=antimalware.log, level="INFO") as logs:
+ with self.assertLogs(logger=antimalware.log, level="INFO"):
await self.cog.on_message(self.message)
self.message.delete.assert_called_once()
- self.assertIn(
- f"INFO:{MODULE}:Tried to delete message `{self.message.id}`, but message could not be found.",
- logs.output
- )
async def test_message_with_illegal_attachment_logs(self):
"""Deleting a message with an illegal attachment should result in a log."""
attachment = MockAttachment(filename="python.disallowed")
self.message.attachments = [attachment]
- file_extensions = {splitext(attachment.filename.lower())[1] for attachment in self.message.attachments}
- extensions_blocked = file_extensions - set(AntiMalwareConfig.whitelist)
- blocked_extensions_str = ', '.join(extensions_blocked)
-
- with self.assertLogs(logger=antimalware.log, level="INFO") as logs:
+ with self.assertLogs(logger=antimalware.log, level="INFO"):
await self.cog.on_message(self.message)
- self.assertEqual(
- [
- f"INFO:{MODULE}:"
- f"User '{self.message.author}' ({self.message.author.id}) "
- f"uploaded blacklisted file(s): {blocked_extensions_str}"
- ],
- logs.output
- )
async def test_get_disallowed_extensions(self):
"""The return value should include all non-whitelisted extensions."""