Use already developed fixture

This commit is contained in:
psakiev 2024-04-30 10:26:12 -06:00
parent 781472001f
commit 32ee6c9dca
15 changed files with 592541 additions and 8 deletions

42284
all.out Normal file

File diff suppressed because it is too large Load Diff

42284
asp.out Normal file

File diff suppressed because it is too large Load Diff

42278
dummy.out Normal file

File diff suppressed because it is too large Load Diff

42952
error.out Normal file

File diff suppressed because it is too large Load Diff

42246
fresh-all.out Normal file

File diff suppressed because it is too large Load Diff

42216
fresh-asp.out Normal file

File diff suppressed because it is too large Load Diff

42243
fresh-non-git-all.out Normal file

File diff suppressed because it is too large Load Diff

42213
fresh-non-git-asp.out Normal file

File diff suppressed because it is too large Load Diff

View File

@ -2817,10 +2817,9 @@ def mock_runtime_dependencies(*args, **kwargs):
@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, install_mockery_mutable_config): def test_git_ref_version_can_be_reused(
# override gcc-runtime dep and make all installs reusable install_mockery_mutable_config, do_not_check_runtimes_on_reuse
monkeypatch.setattr(spack.solver.asp, "_has_runtime_dependencies", mock_runtime_dependencies) ):
first_spec = spack.spec.Spec("zlib-ng@git.2.1.5=2.1.5").concretized() first_spec = spack.spec.Spec("zlib-ng@git.2.1.5=2.1.5").concretized()
first_spec.package.do_install(fake=True, explicit=True) first_spec.package.do_install(fake=True, explicit=True)
@ -2831,15 +2830,14 @@ def test_git_ref_version_can_be_reused(monkeypatch, install_mockery_mutable_conf
@pytest.mark.only_clingo("clingo only re-use feature being tested") @pytest.mark.only_clingo("clingo only re-use feature being tested")
def test_reuse_prefers_standard_over_git_versions(monkeypatch, install_mockery_mutable_config): def test_reuse_prefers_standard_over_git_versions(
install_mockery_mutable_config, do_not_check_runtimes_on_reuse
):
""" """
order matters in this test. typically re-use would pick the last installed match order matters in this test. typically re-use would pick the last installed match
but we want to prefer the standard version over git ref based versions but we want to prefer the standard version over git ref based versions
so install git ref last and ensure it is not picked up by re-use so install git ref last and ensure it is not picked up by re-use
""" """
# override gcc-runtime dep and make all installs reusable
monkeypatch.setattr(spack.solver.asp, "_has_runtime_dependencies", mock_runtime_dependencies)
standard_spec = spack.spec.Spec("zlib-ng@2.1.5").concretized() standard_spec = spack.spec.Spec("zlib-ng@2.1.5").concretized()
standard_spec.package.do_install(fake=True, explicit=True) standard_spec.package.do_install(fake=True, explicit=True)

42284
mod-all.out Normal file

File diff suppressed because it is too large Load Diff

42303
mod-asp.out Normal file

File diff suppressed because it is too large Load Diff

42315
non-git-all.out Normal file

File diff suppressed because it is too large Load Diff

42285
non-git-asp.out Normal file

File diff suppressed because it is too large Load Diff

42321
unit-asp.out Normal file

File diff suppressed because it is too large Load Diff

42311
unit-no-hash.asp Normal file

File diff suppressed because it is too large Load Diff