Fix semantic of variant intersection

alalazo · alalazo · commit 3b89375a23f4 · 2023-03-04T00:09:54.000+01:00
diff --git a/lib/spack/spack/test/spec_semantics.py b/lib/spack/spack/test/spec_semantics.py
@@ -319,31 +319,28 @@ def test_constraining_abstract_specs_with_empty_intersection(self, lhs, rhs):
             rhs.constrain(lhs)
 
     @pytest.mark.parametrize(
-        "lhs,rhs",
+        "lhs,rhs,intersection_expected",
         [
-            ("mpich", "mpich +foo"),
-            ("mpich", "mpich~foo"),
-            ("mpich", "mpich foo=1"),
-            ("mpich", "mpich++foo"),
-            ("mpich", "mpich~~foo"),
-            ("mpich", "mpich foo==1"),
+            ("mpich", "mpich +foo", True),
+            ("mpich", "mpich~foo", True),
+            ("mpich", "mpich foo=1", True),
+            ("mpich", "mpich++foo", True),
+            ("mpich", "mpich~~foo", True),
+            ("mpich", "mpich foo==1", True),
             # Flags semantics is currently different from other variant
-            pytest.param("mpich", 'mpich cppflags="-O3"', marks=pytest.mark.xfail),
-            pytest.param(
-                "multivalue-variant foo=bar", "multivalue-variant +foo", marks=pytest.mark.xfail
-            ),
-            pytest.param(
-                "multivalue-variant foo=bar", "multivalue-variant ~foo", marks=pytest.mark.xfail
-            ),
+            # ("mpich", 'mpich cppflags="-O3"', False),
+            ("multivalue-variant foo=bar", "multivalue-variant +foo", False),
+            ("multivalue-variant foo=bar", "multivalue-variant ~foo", False),
+            ("multivalue-variant fee=bar", "multivalue-variant fee=baz", False),
         ],
     )
     def test_concrete_specs_which_do_not_satisfy_abstract(
-        self, lhs, rhs, default_mock_concretization
+        self, lhs, rhs, intersection_expected, default_mock_concretization
     ):
         lhs, rhs = default_mock_concretization(lhs), Spec(rhs)
 
-        assert lhs.intersects(rhs)
-        assert rhs.intersects(lhs)
+        assert lhs.intersects(rhs) is intersection_expected
+        assert rhs.intersects(lhs) is intersection_expected
         assert not lhs.satisfies(rhs)
         assert not rhs.satisfies(lhs)
 
diff --git a/lib/spack/spack/variant.py b/lib/spack/spack/variant.py
@@ -348,9 +348,10 @@ def satisfies(self, other):
         # (`foo=bar` will never satisfy `baz=bar`)
         return other.name == self.name
 
-    @implicit_variant_conversion
     def intersects(self, other):
         """Returns True if there are variant matching both self and other, False otherwise."""
+        if isinstance(other, (SingleValuedVariant, BoolValuedVariant)):
+            return other.intersects(self)
         return other.name == self.name
 
     def compatible(self, other):
