From f50ddeed9fca4b948b7344a9953b86bb96fca684 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Fri, 13 Oct 2017 11:26:54 -0400 Subject: conftest: mock out spack.store.extensions as well --- lib/spack/spack/test/conftest.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/spack/spack/test/conftest.py b/lib/spack/spack/test/conftest.py index 09aa8b8f86..82cdd848f3 100644 --- a/lib/spack/spack/test/conftest.py +++ b/lib/spack/spack/test/conftest.py @@ -361,12 +361,15 @@ def refresh_db_on_exit(database): def install_mockery(tmpdir, config, builtin_mock): """Hooks a fake install directory, DB, and stage directory into Spack.""" layout = spack.store.layout + extensions = spack.store.extensions db = spack.store.db new_opt = str(tmpdir.join('opt')) # Use a fake install directory to avoid conflicts bt/w # installed pkgs and mock packages. spack.store.layout = spack.directory_layout.YamlDirectoryLayout(new_opt) + spack.store.extensions = spack.directory_layout.YamlExtensionsLayout( + new_opt, spack.store.layout) spack.store.db = spack.database.Database(new_opt) # We use a fake package, so skip the checksum. @@ -376,6 +379,7 @@ def install_mockery(tmpdir, config, builtin_mock): spack.do_checksum = True # Restore Spack's layout. spack.store.layout = layout + spack.store.extensions = extensions spack.store.db = db -- cgit v1.2.3-70-g09d2