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

rework test to parametrize by order and depth of dev spec

Browse Source
This commit is contained in:
Gregory Becker
2022-03-09 09:54:41 -08:00
parent 76da5a1141
commit 1aa900668d
1 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1137,32 +1137,37 @@ def test_external_package_versions(self, spec_str, is_external, expected):
assert s.external == is_external assert s.external == is_external
assert s.satisfies(expected) assert s.satisfies(expected)
def test_reuse_does_not_overwrite_root_dev_specs( @pytest.mark.parametrize('dev_first,spec', [
self, mock_packages, install_mockery, mock_fetch): (True, 'dev-build-test-install'),
# potential parameters (True, 'dev-build-test-dependent'),
package_name = 'dev-build-test-install' (False, 'dev-build-test-install'),
dev_spec_str = '%s dev_path=/fake' % package_name (False, 'dev-build-test-dependent')
# concretize and install a non-dev version ])
s = Spec(package_name).concretized() def test_reuse_does_not_overwrite_dev_specs(
s.package.do_install(fake=True) self, dev_first, spec, tmpdir, mock_packages, install_mockery, mock_fetch):
# concretize a dev version """Test that reuse does not mix dev specs with non-dev specs.
with spack.config.override("concretizer:reuse", True):
dev_spec = Spec(dev_spec_str).concretized() Tests for either order (dev specs are not reused for non-dev, and
assert dev_spec.dag_hash() != s.dag_hash() non-dev specs are not reused for dev specs)
Tests for a spec in which the root is developed and a spec in
which a dep is developed."""
# dev and non-dev specs that are otherwise identical
spec = Spec(spec).normalized() # ensure dependencies present
dev_spec = spec.copy()
dev_constraint = 'dev_path=%s' % tmpdir.strpath
dev_spec['dev-build-test-install'].constrain(dev_constraint)
# run the test in both orders
first_spec = dev_spec if dev_first else spec
second_spec = spec if dev_first else dev_spec
def test_reuse_does_not_overwrite_dependent_dev_specs(
self, mock_packages, install_mockery, mock_fetch):
# potential parameters
root_spec = 'dev-build-test-dependent'
dependency_spec = 'dev-build-test-install'
dev_spec_str = '%s ^%s dev_path=/fake' % (root_spec, dependency_spec)
# concretize and install a non-dev version # concretize and install a non-dev version
s = Spec(root_spec).concretized() first_spec.concretize()
s.package.do_install(fake=True) first_spec.package.do_install(fake=True)
# concretize a dev version # concretize a dev version
with spack.config.override("concretizer:reuse", True): with spack.config.override("concretizer:reuse", True):
dev_spec = Spec(dev_spec_str).concretized() second_spec.concretize()
assert dev_spec.dag_hash() != s.dag_hash() assert first_spec.dag_hash() != second_spec.dag_hash()
@pytest.mark.regression('20292') @pytest.mark.regression('20292')
@pytest.mark.parametrize('context', [ @pytest.mark.parametrize('context', [