fixed tests

Author: sanderegg

packages/aws-library/src/aws_library/ec2/_models.py

@@ -65,25 +65,29 @@ def __gt__(self, other: "Resources") -> bool:
         Non-numeric generic resources must only be defined in self
         to be considered greater
         """
-        if (self.cpus > other.cpus) or (self.ram > other.ram):
-            return True
+        if (self.cpus < other.cpus) or (self.ram < other.ram):
+            return False
 
         keys = set(self.generic_resources) | set(other.generic_resources)
         for k in keys:
             a = self.generic_resources.get(k)
             b = other.generic_resources.get(k)
             if a is None:
-                continue
+                return False
             if b is None:
-                return True
+                # a is greater as b is not defined
+                continue
             if isinstance(a, int | float) and isinstance(b, int | float):
-                if a > b:
-                    return True
-            elif a != b:
-                assert isinstance(a, str | None)  # nosec
-                assert isinstance(b, int | float | str | None)  # nosec
-                return True
-        return False
+                if a < b:
+                    return False
+            else:
+                # remaining options is a is str and b is str or mixed types
+                assert isinstance(a, str)  # nosec
+                assert isinstance(b, int | float | str)  # nosec
+
+        # here we have either everything greater or equal or non-comparable strings
+
+        return self != other
 
     def __add__(self, other: "Resources") -> "Resources":
         """operator for adding two Resources

packages/aws-library/tests/test_ec2_models.py

@@ -36,7 +36,7 @@
         (
             Resources(cpus=0.05, ram=ByteSize(1)),
             Resources(cpus=0.1, ram=ByteSize(0)),
-            True,  # ram is larger
+            False,  # CPU is smaller
         ),
         (
             Resources(cpus=0.1, ram=ByteSize(0)),
@@ -46,7 +46,7 @@
         (
             Resources(cpus=0.1, ram=ByteSize(0), generic_resources={"GPU": 1}),
             Resources(cpus=0.1, ram=ByteSize(1)),
-            True,  # GPU is larger
+            False,  # RAM is smaller
         ),
         (
             Resources(cpus=0.1, ram=ByteSize(1), generic_resources={"GPU": 1}),
@@ -71,7 +71,7 @@
         (
             Resources(cpus=0.1, ram=ByteSize(1), generic_resources={"GPU": "2"}),
             Resources(cpus=0.1, ram=ByteSize(1), generic_resources={"GPU": 2}),
-            True,  # string resrouces are not comparable so "2" is considered larger
+            True,  # string resources are not comparable so "2" is considered larger
         ),
         (
             Resources(cpus=0.1, ram=ByteSize(1), generic_resources={"SSE": "yes"}),
@@ -117,7 +117,7 @@ def test_resources_ge_operator(
         (
             Resources(cpus=0.05, ram=ByteSize(1)),
             Resources(cpus=0.1, ram=ByteSize(0)),
-            True,
+            False,  # CPU is smaller
         ),
         (
             Resources(cpus=0.1, ram=ByteSize(0)),
@@ -127,7 +127,7 @@ def test_resources_ge_operator(
         (
             Resources(cpus=0.1, ram=ByteSize(0), generic_resources={"GPU": 1}),
             Resources(cpus=0.1, ram=ByteSize(1)),
-            True,  # ram is not enough
+            False,  # ram is not enough
         ),
         (
             Resources(cpus=0.1, ram=ByteSize(1), generic_resources={"GPU": 1}),
@@ -144,6 +144,11 @@ def test_resources_ge_operator(
             Resources(cpus=0.1, ram=ByteSize(1), generic_resources={"GPU": 2}),
             False,
         ),
+        (
+            Resources(cpus=0.1, ram=ByteSize(1), generic_resources={"GPU": 2}),
+            Resources(cpus=0.1, ram=ByteSize(1), generic_resources={"GPU": 1}),
+            True,
+        ),
         (
             Resources(cpus=0.1, ram=ByteSize(1)),
             Resources(cpus=0.1, ram=ByteSize(1), generic_resources={"GPU": 2}),
@@ -169,6 +174,11 @@ def test_resources_ge_operator(
             Resources(cpus=0.1, ram=ByteSize(1), generic_resources={"SSE": "yes"}),
             False,
         ),
+        (
+            Resources(cpus=0.1, ram=ByteSize(1), generic_resources={"SSE": "yes"}),
+            Resources(cpus=0.1, ram=ByteSize(1), generic_resources={"SSE": "no"}),
+            True,
+        ),
     ],
 )
 def test_resources_gt_operator(a: Resources, b: Resources, a_greater_than_b: bool):