summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTodd Gamblin <tgamblin@llnl.gov>2018-07-21 14:15:00 -0700
committerTodd Gamblin <tgamblin@llnl.gov>2018-07-21 17:12:36 -0700
commita1d69098642e2ea653bf00acdddaf28adfd01ed8 (patch)
treeccb2b06318d5bd5129a69bbf13af238cc85fe40d
parent0e4909cad8dbc243f1dc3f3c2926f282e8d9f15f (diff)
downloadspack-a1d69098642e2ea653bf00acdddaf28adfd01ed8.tar.gz
spack-a1d69098642e2ea653bf00acdddaf28adfd01ed8.tar.bz2
spack-a1d69098642e2ea653bf00acdddaf28adfd01ed8.tar.xz
spack-a1d69098642e2ea653bf00acdddaf28adfd01ed8.zip
bugfix: stage test no longer modifies ~/.spack/config.yaml
- two stage tests weren't properly using the mutable_config fixture. - this caused running `spack test` to modify the user's config.yaml
-rw-r--r--lib/spack/spack/test/stage.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/spack/spack/test/stage.py b/lib/spack/spack/test/stage.py
index 0d76fe5ede..077a4b0a10 100644
--- a/lib/spack/spack/test/stage.py
+++ b/lib/spack/spack/test/stage.py
@@ -111,7 +111,7 @@ def get_stage_path(stage, stage_name):
@pytest.fixture()
-def tmpdir_for_stage(mock_archive):
+def tmpdir_for_stage(mock_archive, mutable_config):
"""Uses a temporary directory for staging"""
current = spack.paths.stage_path
spack.config.set(
@@ -123,7 +123,7 @@ def tmpdir_for_stage(mock_archive):
@pytest.fixture()
-def mock_archive(tmpdir, monkeypatch):
+def mock_archive(tmpdir, monkeypatch, mutable_config):
"""Creates a mock archive with the structure expected by the tests"""
# Mock up a stage area that looks like this:
#