fixing tests

Author: pcrespov

services/catalog/tests/unit/with_dbs/test_api_rpc.py

@@ -16,6 +16,7 @@
 from models_library.services_history import ServiceRelease
 from models_library.services_types import ServiceKey, ServiceVersion
 from models_library.users import UserID
+from packaging import version
 from pydantic import ValidationError
 from pytest_simcore.helpers.faker_factories import random_icon_url
 from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict
@@ -499,6 +500,8 @@ async def test_rpc_get_my_service_history(
     service_version_1 = "1.0.0"
     service_version_2 = "1.1.0"
 
+    assert version.Version(service_version_1) < version.Version(service_version_2)
+
     # Inject fake service releases for the target service
     fake_releases = [
         create_fake_service_data(
@@ -548,5 +551,5 @@ async def test_rpc_get_my_service_history(
     # Validate the response
     assert isinstance(release_history, list)
     assert len(release_history) == 2
-    assert release_history[0].version == service_version_1
-    assert release_history[1].version == service_version_2
+    assert release_history[0].version == service_version_2, "expected newest first"
+    assert release_history[1].version == service_version_1

services/catalog/tests/unit/with_dbs/test_db_repositories.py

@@ -3,6 +3,7 @@
 # pylint: disable=unused-variable
 # pylint: disable=too-many-arguments
 
+import random
 from collections import Counter
 from collections.abc import Callable
 from dataclasses import dataclass, field
@@ -488,18 +489,26 @@ async def test_get_service_history_page(
     # inject services with multiple versions
     service_key = "simcore/services/dynamic/test-service"
     num_versions = 10
+
+    release_versions = [
+        f"{random.randint(0, 2)}.{random.randint(0, 9)}.{random.randint(0, 9)}"  # noqa: S311
+        for _ in range(num_versions)
+    ]
     await services_db_tables_injector(
         [
             create_fake_service_data(
                 service_key,
-                f"{v}.0.0",
+                service_version,
                 team_access=None,
                 everyone_access=None,
                 product=target_product,
             )
-            for v in range(num_versions)
+            for service_version in release_versions
         ]
     )
+    # sorted AFTER injecting
+    release_versions = sorted(release_versions, key=version.Version, reverse=True)
+    assert version.Version(release_versions[0]) > version.Version(release_versions[-1])
 
     # fetch full history using get_service_history_page
     total_count, history = await services_repo.get_service_history_page(
@@ -509,9 +518,7 @@ async def test_get_service_history_page(
     )
     assert total_count == num_versions
     assert len(history) == num_versions
-    assert [release.version for release in history] == [
-        f"{v}.0.0" for v in reversed(range(num_versions))
-    ]
+    assert [release.version for release in history] == release_versions
 
     # fetch full history using deprecated get_service_history
     deprecated_history = await services_repo.get_service_history(
@@ -536,8 +543,8 @@ async def test_get_service_history_page(
     )
     assert total_count == num_versions
     assert len(paginated_history) == limit
-    assert [release.version for release in paginated_history] == [
-        f"{v}.0.0" for v in reversed(range(offset, offset + limit))
+    assert [release.version for release in paginated_history] == release_versions[
+        offset : offset + limit
     ]
 
     # compare paginated results with the corresponding slice of the full history