zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Style

Browse Source
This commit is contained in:
psakiev 2024-04-29 14:36:38 -06:00
parent 9ef7a3c788
commit 691e3233a3
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/spack/spack/test/concretize.py
View File

@ -4,10 +4,10 @@
# SPDX-License-Identifier: (Apache-2.0 OR MIT) # SPDX-License-Identifier: (Apache-2.0 OR MIT)
import copy import copy
import os import os
import pathlib
import sys import sys
import jinja2 import jinja2
import pathlib
import pytest import pytest
import archspec.cpu import archspec.cpu
@ -2807,19 +2807,27 @@ def test_concretization_version_order():
@pytest.mark.only_clingo("clingo only re-use feature being tested") @pytest.mark.only_clingo("clingo only re-use feature being tested")
@pytest.mark.regression("38484") @pytest.mark.regression("38484")
def test_git_ref_version_can_be_reused(monkeypatch, mock_packages, install_mockery_mutable_config, mock_git_version_info): def test_git_ref_version_can_be_reused(
monkeypatch, mock_packages, install_mockery_mutable_config, mock_git_version_info
):
repo_path, filename, commits = mock_git_version_info repo_path, filename, commits = mock_git_version_info
monkeypatch.setattr( monkeypatch.setattr(
spack.package_base.PackageBase, "git", pathlib.Path(repo_path).as_uri(), raising=False spack.package_base.PackageBase, "git", pathlib.Path(repo_path).as_uri(), raising=False
) )
first_spec = spack.spec.Spec("git-test-commit@git.v1.0=1.0+generic_install+feature").concretized() first_spec = spack.spec.Spec(
"git-test-commit@git.v1.0=1.0+generic_install+feature"
).concretized()
first_spec.package.do_install() first_spec.package.do_install()
with spack.config.override("concretizer:reuse", True): with spack.config.override("concretizer:reuse", True):
second_spec = spack.spec.Spec("git-test-commit@git.v1.0=1.0+generic_install~feature").concretized() second_spec = spack.spec.Spec(
"git-test-commit@git.v1.0=1.0+generic_install~feature"
).concretized()
assert second_spec.dag_hash() != first_spec.dag_hash() assert second_spec.dag_hash() != first_spec.dag_hash()
def test_reuse_prefers_standard_over_git_versions(monkeypatch, mock_packages, install_mockery_mutable_config, mock_git_version_info): def test_reuse_prefers_standard_over_git_versions(
monkeypatch, mock_packages, install_mockery_mutable_config, mock_git_version_info
):
repo_path, filename, commits = mock_git_version_info repo_path, filename, commits = mock_git_version_info
monkeypatch.setattr( monkeypatch.setattr(
spack.package_base.PackageBase, "git", pathlib.Path(repo_path).as_uri(), raising=False spack.package_base.PackageBase, "git", pathlib.Path(repo_path).as_uri(), raising=False
@ -2830,10 +2838,11 @@ def test_reuse_prefers_standard_over_git_versions(monkeypatch, mock_packages, in
""" """
standard_spec = spack.spec.Spec("git-test-commit@1.0+generic_install+feature").concretized() standard_spec = spack.spec.Spec("git-test-commit@1.0+generic_install+feature").concretized()
standard_spec.package.do_install() standard_spec.package.do_install()
git_spec = spack.spec.Spec("git-test-commit@git.v1.0=1.0+generic_install+feature").concretized() git_spec = spack.spec.Spec(
"git-test-commit@git.v1.0=1.0+generic_install+feature"
).concretized()
git_spec.package.do_install() git_spec.package.do_install()
with spack.config.override("concretizer:reuse", True): with spack.config.override("concretizer:reuse", True):
test_spec = spack.spec.Spec("git-test-commit@1.0+generic_install").concretized() test_spec = spack.spec.Spec("git-test-commit@1.0+generic_install").concretized()
assert git_spec.dag_hash() != test_spec.dag_hash() assert git_spec.dag_hash() != test_spec.dag_hash()
assert standard_spec.dag_hash() == test_spec.dag_hash() assert standard_spec.dag_hash() == test_spec.dag_hash()
print(test_spec)

6
var/spack/repos/builtin.mock/packages/git-test-commit/package.py
View File

@ -17,7 +17,11 @@ class GitTestCommit(Package):
version("1.2", tag="1.2") # not a typo version("1.2", tag="1.2") # not a typo
version("2.0", tag="v2.0") version("2.0", tag="v2.0")
variant("generic_install", default=False, description="Override install feature for original implementations tests") variant(
"generic_install",
default=False,
description="Override install feature for original implementations tests",
)
variant("feature", default=False, description="A very cool feature") variant("feature", default=False, description="A very cool feature")
def install(self, spec, prefix): def install(self, spec, prefix):