Unit test changes

This commit is contained in:
psakiev
2022-03-08 14:16:33 -07:00
parent 6d9a214339
commit 76da5a1141

View File

@@ -1138,36 +1138,31 @@ def test_external_package_versions(self, spec_str, is_external, expected):
assert s.satisfies(expected) assert s.satisfies(expected)
def test_reuse_does_not_overwrite_root_dev_specs( def test_reuse_does_not_overwrite_root_dev_specs(
self, tmpdir, mock_packages, install_mockery, mock_fetch): self, mock_packages, install_mockery, mock_fetch):
# potential parameters # potential parameters
package_name = 'dev-build-test-install' package_name = 'dev-build-test-install'
package_version = '0.0.0' dev_spec_str = '%s dev_path=/fake' % package_name
spec_str = package_name
dev_spec_str = '%s@%s dev_path=/fake' % (package_name,
package_version)
# concretize and install a non-dev version # concretize and install a non-dev version
s = Spec(spec_str).concretized() s = Spec(package_name).concretized()
s.package.do_install(fake=True) s.package.do_install(fake=True)
# concretize a dev version # concretize a dev version
dev_spec = Spec(dev_spec_str).concretized(reuse=True) with spack.config.override("concretizer:reuse", True):
assert dev_spec.dag_hash() is not s.dag_hash() dev_spec = Spec(dev_spec_str).concretized()
assert dev_spec.dag_hash() != s.dag_hash()
def test_reuse_does_not_overwrite_dependent_dev_specs( def test_reuse_does_not_overwrite_dependent_dev_specs(
self, tmpdir, mock_packages, install_mockery, mock_fetch): self, mock_packages, install_mockery, mock_fetch):
# potential parameters # potential parameters
root_spec = 'dev-build-test-dependent' root_spec = 'dev-build-test-dependent'
package_name = 'dev-build-test-install' dependency_spec = 'dev-build-test-install'
package_version = '0.0.0' dev_spec_str = '%s ^%s dev_path=/fake' % (root_spec, dependency_spec)
spec_str = root_spec
dev_spec_str = '%s ^%s@%s dev_path=/fake' % (root_spec, package_name,
package_version)
# concretize and install a non-dev version # concretize and install a non-dev version
s = Spec(spec_str).concretized() s = Spec(root_spec).concretized()
s.package.do_install(fake=True) s.package.do_install(fake=True)
# concretize a dev version # concretize a dev version
dev_spec = Spec(dev_spec_str).concretized(reuse=True) with spack.config.override("concretizer:reuse", True):
assert dev_spec.dag_hash() is not s.dag_hash() dev_spec = Spec(dev_spec_str).concretized()
assert dev_spec.dag_hash() != s.dag_hash()
@pytest.mark.regression('20292') @pytest.mark.regression('20292')
@pytest.mark.parametrize('context', [ @pytest.mark.parametrize('context', [