aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar MarkKoz <[email protected]>2020-05-27 17:08:18 -0700
committerGravatar MarkKoz <[email protected]>2020-05-27 17:13:51 -0700
commit96db6087254c957fcb8fb45aad7ffcddb46ee839 (patch)
tree174370fec5b12c4f867e92098a7e67c49562cf2e
parentUse real token values for testing multiple matches in regex (diff)
Switch findall to finditer in assertions
`find_token_in_message` now uses the latter so the tests should adjust accordingly.
-rw-r--r--tests/bot/cogs/test_token_remover.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/bot/cogs/test_token_remover.py b/tests/bot/cogs/test_token_remover.py
index 971bc93fc..4fff3ab33 100644
--- a/tests/bot/cogs/test_token_remover.py
+++ b/tests/bot/cogs/test_token_remover.py
@@ -94,18 +94,18 @@ class TokenRemoverTests(unittest.IsolatedAsyncioTestCase):
return_value = TokenRemover.find_token_in_message(self.msg)
self.assertIsNone(return_value)
- token_re.findall.assert_not_called()
+ token_re.finditer.assert_not_called()
@autospec(TokenRemover, "is_maybe_token")
@autospec("bot.cogs.token_remover", "TOKEN_RE")
def test_find_token_no_matches_returns_none(self, token_re, is_maybe_token):
"""None should be returned if the regex matches no tokens in a message."""
- token_re.findall.return_value = ()
+ token_re.finditer.return_value = ()
return_value = TokenRemover.find_token_in_message(self.msg)
self.assertIsNone(return_value)
- token_re.findall.assert_called_once_with(self.msg.content)
+ token_re.finditer.assert_called_once_with(self.msg.content)
is_maybe_token.assert_not_called()
@autospec(TokenRemover, "is_maybe_token")
@@ -123,7 +123,7 @@ class TokenRemoverTests(unittest.IsolatedAsyncioTestCase):
return_value = TokenRemover.find_token_in_message(self.msg)
self.assertEqual(return_value, matches[true_index])
- token_re.findall.assert_called_once_with(self.msg.content)
+ token_re.finditer.assert_called_once_with(self.msg.content)
# assert_has_calls isn't used cause it'd allow for extra calls before or after.
# The function should short-circuit, so nothing past true_index should have been used.