Moved test date check into a dedicated function

api/tests/conftest.py

@@ -1,5 +1,4 @@
 import contextlib
-import datetime
 import io
 import os
 import PIL
@@ -22,7 +21,6 @@ from django.db.models import QuerySet
 
 from aioresponses import aioresponses
 from dynamic_preferences.registries import global_preferences_registry
-from rest_framework import fields as rest_fields
 from rest_framework.test import APIClient, APIRequestFactory
 
 from funkwhale_api.activity import record
@@ -30,6 +28,7 @@ from funkwhale_api.federation import actors
 from funkwhale_api.moderation import mrf
 from funkwhale_api.music import licenses
 
+from . import utils as test_utils
 
 pytest_plugins = "aiohttp.pytest_plugin"
 
@@ -297,18 +296,9 @@ def authenticated_actor(factories, mocker):
     yield actor
 
 
-@pytest.fixture
+@pytest.fixture(scope="session")
 def to_api_date():
-    def inner(value):
+    return test_utils.to_api_date
-        if isinstance(value, datetime.datetime):
-            f = rest_fields.DateTimeField()
-            return f.to_representation(value)
-        if isinstance(value, datetime.date):
-            f = rest_fields.DateField()
-            return f.to_representation(value)
-        raise ValueError("Invalid value: {}".format(value))
-
-    return inner
 
 
 @pytest.fixture()

api/tests/federation/test_api_serializers.py

@@ -4,7 +4,7 @@ from funkwhale_api.federation import api_serializers
 from funkwhale_api.federation import serializers
 
 
-def test_library_serializer(factories):
+def test_library_serializer(factories, to_api_date):
     library = factories["music.Library"](uploads_count=5678)
     expected = {
         "fid": library.fid,
@@ -12,7 +12,7 @@ def test_library_serializer(factories):
         "actor": serializers.APIActorSerializer(library.actor).data,
         "name": library.name,
         "description": library.description,
-        "creation_date": library.creation_date.isoformat().split("+")[0] + "Z",
+        "creation_date": to_api_date(library.creation_date),
         "uploads_count": library.uploads_count,
         "privacy_level": library.privacy_level,
         "follow": None,
@@ -34,7 +34,7 @@ def test_library_serializer_latest_scan(factories):
     assert serializer.data["latest_scan"] == expected
 
 
-def test_library_serializer_with_follow(factories):
+def test_library_serializer_with_follow(factories, to_api_date):
     library = factories["music.Library"](uploads_count=5678)
     follow = factories["federation.LibraryFollow"](target=library)
 
@@ -45,7 +45,7 @@ def test_library_serializer_with_follow(factories):
         "actor": serializers.APIActorSerializer(library.actor).data,
         "name": library.name,
         "description": library.description,
-        "creation_date": library.creation_date.isoformat().split("+")[0] + "Z",
+        "creation_date": to_api_date(library.creation_date),
         "uploads_count": library.uploads_count,
         "privacy_level": library.privacy_level,
         "follow": api_serializers.NestedLibraryFollowSerializer(follow).data,

api/tests/manage/test_serializers.py

@@ -39,13 +39,13 @@ def test_user_update_permission(factories):
     assert user.permission_settings is False
 
 
-def test_manage_domain_serializer(factories, now):
+def test_manage_domain_serializer(factories, now, to_api_date):
     domain = factories["federation.Domain"](nodeinfo_fetch_date=None)
     setattr(domain, "actors_count", 42)
     setattr(domain, "outbox_activities_count", 23)
     expected = {
         "name": domain.name,
-        "creation_date": domain.creation_date.isoformat().split("+")[0] + "Z",
+        "creation_date": to_api_date(domain.creation_date),
         "actors_count": 42,
         "outbox_activities_count": 23,
         "nodeinfo": {},
@@ -65,14 +65,14 @@ def test_manage_domain_serializer_validates_hostname(db):
         s.is_valid(raise_exception=True)
 
 
-def test_manage_actor_serializer(factories, now):
+def test_manage_actor_serializer(factories, now, to_api_date):
     actor = factories["federation.Actor"]()
     setattr(actor, "uploads_count", 66)
     expected = {
         "id": actor.id,
         "name": actor.name,
-        "creation_date": actor.creation_date.isoformat().split("+")[0] + "Z",
+        "creation_date": to_api_date(actor.creation_date),
-        "last_fetch_date": actor.last_fetch_date.isoformat().split("+")[0] + "Z",
+        "last_fetch_date": to_api_date(actor.last_fetch_date),
         "uploads_count": 66,
         "fid": actor.fid,
         "url": actor.url,
@@ -110,13 +110,15 @@ def test_manage_actor_serializer(factories, now):
         ),
     ],
 )
-def test_instance_policy_serializer_repr(factories, factory_kwargs, expected):
+def test_instance_policy_serializer_repr(
+    factories, factory_kwargs, expected, to_api_date
+):
     policy = factories["moderation.InstancePolicy"](block_all=True, **factory_kwargs)
 
     e = {
         "id": policy.id,
         "uuid": str(policy.uuid),
-        "creation_date": policy.creation_date.isoformat().split("+")[0] + "Z",
+        "creation_date": to_api_date(policy.creation_date),
         "actor": policy.actor.full_username,
         "block_all": True,
         "silence_activity": False,
@@ -280,7 +282,7 @@ def test_instance_policy_serializer_purges_target_actor(
     assert on_commit.call_count == 0
 
 
-def test_manage_artist_serializer(factories, now):
+def test_manage_artist_serializer(factories, now, to_api_date):
     artist = factories["music.Artist"](attributed=True)
     track = factories["music.Track"](artist=artist)
     album = factories["music.Album"](artist=artist)
@@ -291,7 +293,7 @@ def test_manage_artist_serializer(factories, now):
         "fid": artist.fid,
         "name": artist.name,
         "mbid": artist.mbid,
-        "creation_date": artist.creation_date.isoformat().split("+")[0] + "Z",
+        "creation_date": to_api_date(artist.creation_date),
         "albums": [serializers.ManageNestedAlbumSerializer(album).data],
         "tracks": [serializers.ManageNestedTrackSerializer(track).data],
         "attributed_to": serializers.ManageBaseActorSerializer(
@@ -304,7 +306,7 @@ def test_manage_artist_serializer(factories, now):
     assert s.data == expected
 
 
-def test_manage_nested_track_serializer(factories, now):
+def test_manage_nested_track_serializer(factories, now, to_api_date):
     track = factories["music.Track"]()
     expected = {
         "id": track.id,
@@ -313,7 +315,7 @@ def test_manage_nested_track_serializer(factories, now):
         "fid": track.fid,
         "title": track.title,
         "mbid": track.mbid,
-        "creation_date": track.creation_date.isoformat().split("+")[0] + "Z",
+        "creation_date": to_api_date(track.creation_date),
         "position": track.position,
         "disc_number": track.disc_number,
         "copyright": track.copyright,
@@ -324,7 +326,7 @@ def test_manage_nested_track_serializer(factories, now):
     assert s.data == expected
 
 
-def test_manage_nested_album_serializer(factories, now):
+def test_manage_nested_album_serializer(factories, now, to_api_date):
     album = factories["music.Album"]()
     setattr(album, "tracks_count", 44)
     expected = {
@@ -334,7 +336,7 @@ def test_manage_nested_album_serializer(factories, now):
         "fid": album.fid,
         "title": album.title,
         "mbid": album.mbid,
-        "creation_date": album.creation_date.isoformat().split("+")[0] + "Z",
+        "creation_date": to_api_date(album.creation_date),
         "release_date": album.release_date.isoformat(),
         "cover": {
             "original": album.cover.url,
@@ -349,7 +351,7 @@ def test_manage_nested_album_serializer(factories, now):
     assert s.data == expected
 
 
-def test_manage_nested_artist_serializer(factories, now):
+def test_manage_nested_artist_serializer(factories, now, to_api_date):
     artist = factories["music.Artist"]()
     expected = {
         "id": artist.id,
@@ -358,14 +360,14 @@ def test_manage_nested_artist_serializer(factories, now):
         "fid": artist.fid,
         "name": artist.name,
         "mbid": artist.mbid,
-        "creation_date": artist.creation_date.isoformat().split("+")[0] + "Z",
+        "creation_date": to_api_date(artist.creation_date),
     }
     s = serializers.ManageNestedArtistSerializer(artist)
 
     assert s.data == expected
 
 
-def test_manage_album_serializer(factories, now):
+def test_manage_album_serializer(factories, now, to_api_date):
     album = factories["music.Album"](attributed=True)
     track = factories["music.Track"](album=album)
     expected = {
@@ -375,7 +377,7 @@ def test_manage_album_serializer(factories, now):
         "fid": album.fid,
         "title": album.title,
         "mbid": album.mbid,
-        "creation_date": album.creation_date.isoformat().split("+")[0] + "Z",
+        "creation_date": to_api_date(album.creation_date),
         "release_date": album.release_date.isoformat(),
         "cover": {
             "original": album.cover.url,
@@ -395,7 +397,7 @@ def test_manage_album_serializer(factories, now):
     assert s.data == expected
 
 
-def test_manage_track_serializer(factories, now):
+def test_manage_track_serializer(factories, now, to_api_date):
     track = factories["music.Track"](attributed=True)
     setattr(track, "uploads_count", 44)
     expected = {
@@ -409,7 +411,7 @@ def test_manage_track_serializer(factories, now):
         "position": track.position,
         "copyright": track.copyright,
         "license": track.license,
-        "creation_date": track.creation_date.isoformat().split("+")[0] + "Z",
+        "creation_date": to_api_date(track.creation_date),
         "artist": serializers.ManageNestedArtistSerializer(track.artist).data,
         "album": serializers.ManageTrackAlbumSerializer(track.album).data,
         "attributed_to": serializers.ManageBaseActorSerializer(
@@ -423,7 +425,7 @@ def test_manage_track_serializer(factories, now):
     assert s.data == expected
 
 
-def test_manage_library_serializer(factories, now):
+def test_manage_library_serializer(factories, now, to_api_date):
     library = factories["music.Library"]()
     setattr(library, "followers_count", 42)
     setattr(library, "_uploads_count", 44)
@@ -438,7 +440,7 @@ def test_manage_library_serializer(factories, now):
         "name": library.name,
         "description": library.description,
         "privacy_level": library.privacy_level,
-        "creation_date": library.creation_date.isoformat().split("+")[0] + "Z",
+        "creation_date": to_api_date(library.creation_date),
         "actor": serializers.ManageBaseActorSerializer(library.actor).data,
         "uploads_count": 44,
         "followers_count": 42,
@@ -448,7 +450,7 @@ def test_manage_library_serializer(factories, now):
     assert s.data == expected
 
 
-def test_manage_upload_serializer(factories, now):
+def test_manage_upload_serializer(factories, now, to_api_date):
     upload = factories["music.Upload"]()
 
     expected = {
@@ -466,8 +468,8 @@ def test_manage_upload_serializer(factories, now):
         "source": upload.source,
         "filename": upload.filename,
         "metadata": upload.metadata,
-        "creation_date": upload.creation_date.isoformat().split("+")[0] + "Z",
+        "creation_date": to_api_date(upload.creation_date),
-        "modification_date": upload.modification_date.isoformat().split("+")[0] + "Z",
+        "modification_date": to_api_date(upload.modification_date),
         "accessed_date": None,
         "import_date": None,
         "import_metadata": upload.import_metadata,
@@ -502,7 +504,7 @@ def test_action_serializer_delete(factory, serializer_class, factories):
     assert objects[0].__class__.objects.count() == 0
 
 
-def test_manage_tag_serializer(factories):
+def test_manage_tag_serializer(factories, to_api_date):
     tag = factories["tags.Tag"]()
 
     setattr(tag, "_tracks_count", 42)
@@ -511,7 +513,7 @@ def test_manage_tag_serializer(factories):
     expected = {
         "id": tag.id,
         "name": tag.name,
-        "creation_date": tag.creation_date.isoformat().split("+")[0] + "Z",
+        "creation_date": to_api_date(tag.creation_date),
         "tracks_count": 42,
         "albums_count": 54,
         "artists_count": 66,

api/tests/music/test_serializers.py

@@ -118,7 +118,7 @@ def test_upload_serializer(factories, to_api_date):
         "bitrate": upload.bitrate,
         "size": upload.size,
         "library": serializers.LibraryForOwnerSerializer(upload.library).data,
-        "creation_date": upload.creation_date.isoformat().split("+")[0] + "Z",
+        "creation_date": to_api_date(upload.creation_date),
         "import_date": None,
         "import_status": "pending",
     }
@@ -145,7 +145,7 @@ def test_upload_owner_serializer(factories, to_api_date):
         "bitrate": upload.bitrate,
         "size": upload.size,
         "library": serializers.LibraryForOwnerSerializer(upload.library).data,
-        "creation_date": upload.creation_date.isoformat().split("+")[0] + "Z",
+        "creation_date": to_api_date(upload.creation_date),
         "metadata": {"test": "metadata"},
         "import_metadata": {"import": "metadata"},
         "import_date": None,

api/tests/radios/test_serializers.py

@@ -29,7 +29,7 @@ def test_create_artist_radio(factories):
     assert session.related_object == artist
 
 
-def test_tag_radio_repr(factories):
+def test_tag_radio_repr(factories, to_api_date):
     tag = factories["tags.Tag"]()
     session = factories["radios.RadioSession"](related_object=tag, radio_type="tag")
 
@@ -39,6 +39,6 @@ def test_tag_radio_repr(factories):
         "custom_radio": None,
         "user": session.user.pk,
         "related_object_id": tag.name,
-        "creation_date": session.creation_date.isoformat().split("+")[0] + "Z",
+        "creation_date": to_api_date(session.creation_date),
     }
     assert serializers.RadioSessionSerializer(session).data == expected

api/tests/tags/test_serializers.py

@@ -3,15 +3,12 @@ import pytest
 from funkwhale_api.tags import serializers
 
 
-def test_tag_serializer(factories):
+def test_tag_serializer(factories, to_api_date):
     tag = factories["tags.Tag"]()
 
     serializer = serializers.TagSerializer(tag)
 
-    expected = {
+    expected = {"name": tag.name, "creation_date": to_api_date(tag.creation_date)}
-        "name": tag.name,
-        "creation_date": tag.creation_date.isoformat().split("+")[0] + "Z",
-    }
 
     assert serializer.data == expected
 

api/tests/test_test_utils.py

@@ -0,0 +1,6 @@
+from . import utils as test_utils
+
+
+def test_to_api_date(now):
+
+    assert test_utils.to_api_date(now) == now.isoformat().split("+")[0] + "Z"

api/tests/utils.py

@@ -0,0 +1,12 @@
+import datetime
+from rest_framework import fields as rest_fields
+
+
+def to_api_date(value):
+    if isinstance(value, datetime.datetime):
+        f = rest_fields.DateTimeField()
+        return f.to_representation(value)
+    if isinstance(value, datetime.date):
+        f = rest_fields.DateField()
+        return f.to_representation(value)
+    raise ValueError("Invalid value: {}".format(value))