Fix remaining test failures and enable label validation

Signed-off-by: Michał Górny <mgorny@quansight.com>

Author: mgorny

tests/models/test_variant.py

@@ -427,7 +427,6 @@ def test_random_hexdigest(vdesc: VariantDescription) -> None:
     assert len(vdesc.hexdigest) == VARIANT_HASH_LENGTH
 
 
-@pytest.mark.xfail(reason="Validation is disabled for porting")
 def test_null_variant_label():
     with pytest.raises(
         ValidationError,

tests/test_variants_json.py

@@ -317,16 +317,18 @@ def test_to_str() -> None:
         [
             VariantProperty("ns1", "f1", "v1"),
             VariantProperty("ns2", "f2", "v1"),
-        ]
+        ],
+        label="a",
     )
     vdesc2 = VariantDescription(
         [
             VariantProperty("ns2", "f2", "v2"),
-        ]
+        ],
+        label="b",
     )
     variants_json.variants = {
-        vdesc1.hexdigest: vdesc1,
-        vdesc2.hexdigest: vdesc2,
+        "a": vdesc1,
+        "b": vdesc2,
     }
     assert json.loads(variants_json.to_str()) == {
         VARIANTS_JSON_SCHEMA_KEY: VARIANTS_JSON_SCHEMA_URL,
@@ -347,8 +349,8 @@ def test_to_str() -> None:
             },
         },
         VARIANTS_JSON_VARIANT_DATA_KEY: {
-            "b3b0305c": {"ns1": {"f1": ["v1"]}, "ns2": {"f2": ["v1"]}},
-            "9177ff3f": {"ns2": {"f2": ["v2"]}},
+            "a": {"ns1": {"f1": ["v1"]}, "ns2": {"f2": ["v1"]}},
+            "b": {"ns2": {"f2": ["v2"]}},
         },
     }
 
@@ -501,12 +503,13 @@ def test_merge_variants() -> None:
 def test_null_variant_label():
     with pytest.raises(
         ValidationError,
-        match=rf"{NULL_VARIANT_LABEL!r} label can only be used for the null variant",
+        match=rf"{NULL_VARIANT_LABEL!r} label can be used only for the null variant",
     ):
         VariantsJson(
             {VARIANTS_JSON_VARIANT_DATA_KEY: {NULL_VARIANT_LABEL: {"x": {"y": ["z"]}}}}
         )
     with pytest.raises(
-        ValidationError, match=rf"Null variant must use {NULL_VARIANT_LABEL!r} label"
+        ValidationError,
+        match=rf"Null variant must always use {NULL_VARIANT_LABEL!r} label",
     ):
         VariantsJson({VARIANTS_JSON_VARIANT_DATA_KEY: {"zuul": {}}})

variantlib/commands/get_variant_hash.py

@@ -6,6 +6,7 @@
 from variantlib import __package_name__
 from variantlib.api import VariantDescription
 from variantlib.api import VariantProperty
+from variantlib.constants import NULL_VARIANT_LABEL
 
 
 def get_variant_hash(args: list[str]) -> None:
@@ -35,6 +36,8 @@ def get_variant_hash(args: list[str]) -> None:
 
 def _print_variant_hash(properties: list[VariantProperty]) -> None:
     # Transform properties into a VariantDescription
-    vdesc = VariantDescription(properties=properties)
+    vdesc = VariantDescription(
+        properties=properties, label="na" if properties else NULL_VARIANT_LABEL
+    )
 
     sys.stdout.write(f"{vdesc.hexdigest}\n")

variantlib/commands/make_variant.py

@@ -169,7 +169,7 @@ def _make_variant(
 
     if not is_null_variant:
         # Transform properties into a VariantDescription
-        vdesc = VariantDescription(properties=properties)
+        vdesc = VariantDescription(properties=properties, label="na")
 
         if validate_properties:
             env_factory: DefaultIsolatedEnv | nullcontext[None]

variantlib/models/variant.py

@@ -187,18 +187,15 @@ def __post_init__(self) -> None:
         # Execute the validator
         super().__post_init__()
 
-        # TODO: enable once we're done porting
-        if False:
-            if self.is_null_variant():
-                if self.label != NULL_VARIANT_LABEL:
-                    raise ValidationError(
-                        f"Null variant must always use {NULL_VARIANT_LABEL!r} label"
-                    )
-            elif self.label == NULL_VARIANT_LABEL:
+        if self.is_null_variant():
+            if self.label != NULL_VARIANT_LABEL:
                 raise ValidationError(
-                    f"{NULL_VARIANT_LABEL!r} label can be used only for the null "
-                    "variant"
+                    f"Null variant must always use {NULL_VARIANT_LABEL!r} label"
                 )
+        elif self.label == NULL_VARIANT_LABEL:
+            raise ValidationError(
+                f"{NULL_VARIANT_LABEL!r} label can be used only for the null variant"
+            )
 
     def is_null_variant(self) -> bool:
         """