Merge pull request #525 from golemfactory/b0.6-fix-constraints

Fix join_str_constraints (#524)
golemfactory · Jul 6, 2021 · e877026 · e877026
2 parents a8a9654 + bdd22c4
commit e877026
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/tests/payload/test_payload.py b/tests/payload/test_payload.py
@@ -22,5 +22,5 @@ async def test_payload():
     assert builder.properties == {"golem.srv.app.foo.port": 1234}
     assert (
         builder.constraints
-        == "((&(golem.runtime.name=foo)\n\t(golem.inf.mem.gib>=32)\n\t(golem.inf.storage.gib>=1024)))"
+        == "(&(golem.runtime.name=foo)\n\t(golem.inf.mem.gib>=32)\n\t(golem.inf.storage.gib>=1024))"
     )
diff --git a/tests/props/test_base.py b/tests/props/test_base.py
@@ -77,19 +77,19 @@ def test_constraint_model_serialize():
         (
             FooToo,
             "!",
-            "(!((baz=21)))",
+            "(!(baz=21))",
             False,
         ),
         (
             FooToo,
             "&",
-            "((baz=21))",
+            "(baz=21)",
             False,
         ),
         (
             FooToo,
             "|",
-            "((baz=21))",
+            "(baz=21)",
             False,
         ),
         (

diff --git a/tests/props/test_builder.py b/tests/props/test_builder.py
@@ -16,4 +16,4 @@ class Foo(AutodecoratingModel):
     demand = DemandBuilder()
     await foo.decorate_demand(demand)
     assert demand.properties == {"some.bar": "a nice one"}
-    assert demand.constraints == "(((baz<=50)))"
+    assert demand.constraints == "(baz<=50)"
diff --git a/yapapi/props/base.py b/yapapi/props/base.py
@@ -318,15 +318,15 @@ def join_str_constraints(constraints: List[str], operator: ConstraintGroupOperat
     """
     if operator == "!":
         if len(constraints) == 1:
-            return f"({operator}({constraints[0]}))"
+            return f"({operator}{constraints[0]})"
         else:
             raise ConstraintException(f"{operator} requires exactly one component.")
 
     if not constraints:
         return f"({operator})"
 
     if len(constraints) == 1:
-        return f"({constraints[0]})"
+        return f"{constraints[0]}"
 
     rules = "\n\t".join(constraints)
     return f"({operator}{rules})"