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

Remove unneccessary work due to mock_fetch

Browse Source
This commit is contained in:
psakiev
2022-03-07 22:38:48 -07:00
parent f383ca40db
commit 17713c0151
1 changed files with 30 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1139,42 +1139,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(self, tmpdir, mock_packages, install_mockery, mock_fetch): def test_reuse_does_not_overwrite_root_dev_specs(
with tmpdir.as_cwd(): self, tmpdir, 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' package_version = '0.0.0'
# have to setup paths to get concretization to work spec_str = package_name
dev_path = '%s/%s' % (tmpdir.strpath, package_name) dev_spec_str = '%s@%s dev_path=/fake' % (package_name,
os.makedirs(dev_path) package_version)
spec_str = package_name # concretize and install a non-dev version
dev_spec_str = '%s@%s dev_path=%s' % (package_name, s = Spec(spec_str).concretized()
package_version, dev_path) s.package.do_install(fake=True)
# concretize and install a non-dev version # concretize a dev version
s = Spec(spec_str).concretized() dev_spec = Spec(dev_spec_str).concretized(reuse=True)
s.package.do_install(fake=True) assert dev_spec.dag_hash() is not s.dag_hash()
# concretize a dev version
dev_spec = Spec(dev_spec_str).concretized(reuse=True)
assert dev_spec.dag_hash() is not s.dag_hash()
def test_reuse_does_not_overwrite_dependent_dev_specs(self, tmpdir, mock_packages, install_mockery, mock_fetch): def test_reuse_does_not_overwrite_dependent_dev_specs(
with tmpdir.as_cwd(): self, tmpdir, 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' package_name = 'dev-build-test-install'
package_version = '0.0.0' package_version = '0.0.0'
# have to setup paths to get concretization to work
dev_path = '%s/%s' % (tmpdir.strpath, package_name) spec_str = root_spec
os.makedirs(dev_path) dev_spec_str = '%s ^%s@%s dev_path=/fake' % (root_spec, package_name,
spec_str = root_spec package_version)
dev_spec_str = '%s ^%s@%s dev_path=%s' % (root_spec, package_name, # concretize and install a non-dev version
package_version, dev_path) s = Spec(spec_str).concretized()
# concretize and install a non-dev version s.package.do_install(fake=True)
s = Spec(spec_str).concretized() # concretize a dev version
s.package.do_install(fake=True) dev_spec = Spec(dev_spec_str).concretized(reuse=True)
# concretize a dev version assert dev_spec.dag_hash() is not s.dag_hash()
dev_spec = Spec(dev_spec_str).concretized(reuse=True)
assert dev_spec.dag_hash() is not s.dag_hash()
@pytest.mark.regression('20292') @pytest.mark.regression('20292')