diff options
Diffstat (limited to 'lib/spack/spack/test/install.py')
| -rw-r--r-- | lib/spack/spack/test/install.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/spack/spack/test/install.py b/lib/spack/spack/test/install.py index 599087ac78..42c68fd6bd 100644 --- a/lib/spack/spack/test/install.py +++ b/lib/spack/spack/test/install.py @@ -15,7 +15,7 @@ import spack.patch import spack.repo import spack.store import spack.util.spack_json as sjson -from spack.package import ( +from spack.package_base import ( InstallError, PackageBase, PackageStillNeededError, @@ -238,7 +238,7 @@ def test_flatten_deps( assert dependency_name not in os.listdir(pkg.prefix) # Flatten the dependencies and ensure the dependency directory is there. - spack.package.flatten_dependencies(spec, pkg.prefix) + spack.package_base.flatten_dependencies(spec, pkg.prefix) dependency_dir = os.path.join(pkg.prefix, dependency_name) assert os.path.isdir(dependency_dir) @@ -322,7 +322,7 @@ def test_partial_install_keep_prefix(install_mockery, mock_fetch, monkeypatch): # If remove_prefix is called at any point in this test, that is an # error pkg.succeed = False # make the build fail - monkeypatch.setattr(spack.package.Package, 'remove_prefix', mock_remove_prefix) + monkeypatch.setattr(spack.package_base.Package, 'remove_prefix', mock_remove_prefix) with pytest.raises(spack.build_environment.ChildError): pkg.do_install(keep_prefix=True) assert os.path.exists(pkg.prefix) @@ -340,7 +340,7 @@ def test_partial_install_keep_prefix(install_mockery, mock_fetch, monkeypatch): def test_second_install_no_overwrite_first(install_mockery, mock_fetch, monkeypatch): spec = Spec('canfail').concretized() pkg = spack.repo.get(spec) - monkeypatch.setattr(spack.package.Package, 'remove_prefix', mock_remove_prefix) + monkeypatch.setattr(spack.package_base.Package, 'remove_prefix', mock_remove_prefix) pkg.succeed = True pkg.do_install() |