Merge branch 'master' into master

3 files changed, 69 insertions, 8 deletions

diff --git a/tests/helpers.py b/tests/helpers.py
index 2908294f7..25059fa3a 100644
--- a/tests/helpers.py
+++ b/tests/helpers.py
@@ -7,6 +7,10 @@ __all__ = ('AsyncMock', 'async_test')
 
 
 # TODO: Remove me on 3.8
+# Allows you to mock a coroutine. Since the default `__call__` of `MagicMock`
+# is not a coroutine, trying to mock a coroutine with it will result in errors
+# as the default `__call__` is not awaitable. Use this class for monkeypatching
+# coroutines instead.
 class AsyncMock(MagicMock):
     async def __call__(self, *args, **kwargs):
         return super(AsyncMock, self).__call__(*args, **kwargs)
diff --git a/tests/test_resources.py b/tests/test_resources.py
index 2b17aea64..bcf124f05 100644
--- a/tests/test_resources.py
+++ b/tests/test_resources.py
@@ -1,18 +1,13 @@
 import json
-import mimetypes
 from pathlib import Path
-from urllib.parse import urlparse
 
 
 def test_stars_valid():
-    """Validates that `bot/resources/stars.json` contains valid images."""
+    """Validates that `bot/resources/stars.json` contains a list of strings."""
 
     path = Path('bot', 'resources', 'stars.json')
     content = path.read_text()
     data = json.loads(content)
 
-    for url in data.values():
-        assert urlparse(url).scheme == 'https'
-
-        mimetype, _ = mimetypes.guess_type(url)
-        assert mimetype in ('image/jpeg', 'image/png')
+    for name in data:
+        assert type(name) is str
diff --git a/tests/utils/test_time.py b/tests/utils/test_time.py
new file mode 100644
index 000000000..4baa6395c
--- /dev/null
+++ b/tests/utils/test_time.py
@@ -0,0 +1,62 @@
+import asyncio
+from datetime import datetime, timezone
+from unittest.mock import patch
+
+import pytest
+from dateutil.relativedelta import relativedelta
+
+from bot.utils import time
+from tests.helpers import AsyncMock
+
+
[email protected](
+    ('delta', 'precision', 'max_units', 'expected'),
+    (
+        (relativedelta(days=2), 'seconds', 1, '2 days'),
+        (relativedelta(days=2, hours=2), 'seconds', 2, '2 days and 2 hours'),
+        (relativedelta(days=2, hours=2), 'seconds', 1, '2 days'),
+        (relativedelta(days=2, hours=2), 'days', 2, '2 days'),
+
+        # Does not abort for unknown units, as the unit name is checked
+        # against the attribute of the relativedelta instance.
+        (relativedelta(days=2, hours=2), 'elephants', 2, '2 days and 2 hours'),
+
+        # Very high maximum units, but it only ever iterates over
+        # each value the relativedelta might have.
+        (relativedelta(days=2, hours=2), 'hours', 20, '2 days and 2 hours'),
+    )
+)
+def test_humanize_delta(
+        delta: relativedelta,
+        precision: str,
+        max_units: int,
+        expected: str
+):
+    assert time.humanize_delta(delta, precision, max_units) == expected
+
+
[email protected]('max_units', (-1, 0))
+def test_humanize_delta_raises_for_invalid_max_units(max_units: int):
+    with pytest.raises(ValueError, match='max_units must be positive'):
+        time.humanize_delta(relativedelta(days=2, hours=2), 'hours', max_units)
+
+
[email protected](
+    ('stamp', 'expected'),
+    (
+        ('Sun, 15 Sep 2019 12:00:00 GMT', datetime(2019, 9, 15, 12, 0, 0, tzinfo=timezone.utc)),
+    )
+)
+def test_parse_rfc1123(stamp: str, expected: str):
+    assert time.parse_rfc1123(stamp) == expected
+
+
+@patch('asyncio.sleep', new_callable=AsyncMock)
+def test_wait_until(sleep_patch):
+    start = datetime(2019, 1, 1, 0, 0)
+    then = datetime(2019, 1, 1, 0, 10)
+
+    # No return value
+    assert asyncio.run(time.wait_until(then, start)) is None
+
+    sleep_patch.assert_called_once_with(10 * 60)