chore: correct resource pool comparison in tests (#433)

This was causing tests to fail sporadically. Closes #432.

Author: olevski

components/renku_data_services/crc/models.py

@@ -212,18 +212,17 @@ def __eq__(self, other: Any) -> bool:
         if not isinstance(other, ResourcePool):
             return False
 
-        if self.id != other.id:
-            return False
-        if self.name != other.name:
-            return False
-        if self.default != other.default or self.public != other.public:
-            return False
-        if self.idle_threshold != other.idle_threshold or self.hibernation_threshold != other.hibernation_threshold:
-            return False
-
-        this_classes = sorted(self.classes, key=lambda x: (x.default, x.cpu, x.memory, x.default_storage, x.name))
-        other_classes = sorted(other.classes, key=lambda x: (x.default, x.cpu, x.memory, x.default_storage, x.name))
-        return this_classes == other_classes
+        return (
+            self.id == other.id
+            and self.name == other.name
+            and self.default == other.default
+            and self.public == other.public
+            and self.idle_threshold == other.idle_threshold
+            and self.hibernation_threshold == other.hibernation_threshold
+            and self.quota == other.quota
+            and sorted(self.classes, key=lambda x: x.id or x.name)
+            == sorted(other.classes, key=lambda x: x.id or x.name)
+        )
 
     def set_quota(self, val: Quota) -> "ResourcePool":
         """Set the quota for a resource pool."""

test/components/renku_data_services/db/test_sqlalchemy_pool_repo.py

@@ -119,11 +119,16 @@ async def test_resource_pool_update_classes(
 
         assert updated_rp.id == inserted_rp.id
         assert len(updated_rp.classes) == len(inserted_rp.classes)
-        assert updated_rp.classes == new_classes_models
+        assert sorted(
+            updated_rp.classes,
+            key=lambda x: x.id or x.name,
+        ) == sorted(
+            new_classes_models,
+            key=lambda x: x.id or x.name,
+        )
         retrieved_rps = await pool_repo.get_resource_pools(id=inserted_rp.id, api_user=admin_user)
         assert len(retrieved_rps) == 1
         assert retrieved_rps[0] == updated_rp
-        assert retrieved_rps[0].classes == updated_rp.classes
     except (ValidationError, errors.ValidationError):
         pass
     finally: