diff --git a/lib/spack/spack/test/concretization/core.py b/lib/spack/spack/test/concretization/core.py index f629c7827a4..4a743fe922e 100644 --- a/lib/spack/spack/test/concretization/core.py +++ b/lib/spack/spack/test/concretization/core.py @@ -2735,6 +2735,7 @@ def test_phil_git_based_version_must_exist_to_use_ref(self): spack.concretize.concretize_one(f"gmake commit={'a' * 40}") assert "Cannot use commit variant with" in e.value.message + @pytest.mark.disable("not supporting on this branch") def test_phil_commit_variant_in_absence_of_version_selects_max_infinity_version(self): spec = spack.concretize.concretize_one(f"git-ref-package commit={'a' * 40}") assert spec.satisfies("@develop") diff --git a/lib/spack/spack/test/packages.py b/lib/spack/spack/test/packages.py index 9076e0e1874..b8ed1df1a6d 100644 --- a/lib/spack/spack/test/packages.py +++ b/lib/spack/spack/test/packages.py @@ -349,16 +349,7 @@ def test_phil_package_condtional_variants_may_depend_on_commit(mock_packages, co assert conditional_variant.value -""" -Issues: -- version has commit Version("foo", commit=) -- version needs commit Version("master", branch=) -- cli default -- contraints/overridding current selection -- constraints/changing current selection -""" - - +@pytest.mark.disable("not supporting on this branch") def test_phil_commit_variant_finds_matches_for_commit_versions(mock_packages, config): """ test conditional dependence on `when='commit='`