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

Fix a few minor issues in tests (#48735)

Browse Source 
* test_no_matching_compiler_specs: does not need mock_low_high_config,
  since mutable_config is already used at class level
* bindist.py: setup a configuration that doesn't super-impose builtin.mock
  over builtin
* builder.py: use a mock configuration for the tests
This commit is contained in:
Massimiliano Culpo 2025-01-27 23:36:27 +01:00 committed by GitHub
parent 615b7a6ddb
commit 13558269b5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/spack/spack/test/bindist.py
View File

@ -36,6 +36,7 @@
import spack.mirrors.mirror import spack.mirrors.mirror
import spack.oci.image import spack.oci.image
import spack.paths import spack.paths
import spack.repo
import spack.spec import spack.spec
import spack.store import spack.store
import spack.util.gpg import spack.util.gpg
@ -94,7 +95,7 @@ def config_directory(tmp_path_factory):
@pytest.fixture(scope="function") @pytest.fixture(scope="function")
def default_config(tmp_path, config_directory, monkeypatch, install_mockery): def default_config(tmp_path, config_directory, mock_repo_path, install_mockery):
# This fixture depends on install_mockery to ensure # This fixture depends on install_mockery to ensure
# there is a clear order of initialization. The substitution of the # there is a clear order of initialization. The substitution of the
# config scopes here is done on top of the substitution that comes with # config scopes here is done on top of the substitution that comes with
@ -109,7 +110,6 @@ def default_config(tmp_path, config_directory, monkeypatch, install_mockery):
] ]
with spack.config.use_configuration(*scopes): with spack.config.use_configuration(*scopes):
spack.config.CONFIG.set("repos", [spack.paths.mock_packages_path])
njobs = spack.config.get("config:build_jobs") njobs = spack.config.get("config:build_jobs")
if not njobs: if not njobs:
spack.config.set("config:build_jobs", 4, scope="user") spack.config.set("config:build_jobs", 4, scope="user")
@ -130,8 +130,8 @@ def default_config(tmp_path, config_directory, monkeypatch, install_mockery):
timeout = spack.config.get("config:connect_timeout") timeout = spack.config.get("config:connect_timeout")
if not timeout: if not timeout:
spack.config.set("config:connect_timeout", 10, scope="user") spack.config.set("config:connect_timeout", 10, scope="user")
with spack.repo.use_repositories(mock_repo_path):
yield spack.config.CONFIG yield spack.config.CONFIG
@pytest.fixture(scope="function") @pytest.fixture(scope="function")

2
lib/spack/spack/test/builder.py
View File

@ -14,7 +14,7 @@
@pytest.fixture() @pytest.fixture()
def builder_test_repository(): def builder_test_repository(config):
builder_test_path = os.path.join(spack.paths.repos_path, "builder.test") builder_test_path = os.path.join(spack.paths.repos_path, "builder.test")
with spack.repo.use_repositories(builder_test_path) as mock_repo: with spack.repo.use_repositories(builder_test_path) as mock_repo:
yield mock_repo yield mock_repo

2
lib/spack/spack/test/concretization/core.py
View File

@ -720,7 +720,7 @@ def test_concretize_propagate_variant_second_level_dep_not_in_source(self):
assert spec.satisfies("^second-dependency-foo-bar-fee +fee") assert spec.satisfies("^second-dependency-foo-bar-fee +fee")
assert not spec.satisfies("parent-foo-bar +fee") assert not spec.satisfies("parent-foo-bar +fee")
def test_no_matching_compiler_specs(self, mock_low_high_config): def test_no_matching_compiler_specs(self):
# only relevant when not building compilers as needed # only relevant when not building compilers as needed
with spack.concretize.enable_compiler_existence_check(): with spack.concretize.enable_compiler_existence_check():
s = Spec("pkg-a %gcc@=0.0.0") s = Spec("pkg-a %gcc@=0.0.0")