hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

tests: make env tests that use configs non-destructive

Browse source 
Environment tests pushed config scopes but didn't properly remove them.

- [x] use `with env:` context manager instead of `env.prepare_config_scopes()`
This commit is contained in:
Todd Gamblin 2019-12-29 02:16:14 -08:00
parent 8e8235043d
commit e839432472
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
lib/spack/spack/test/cmd/env.py
View file

@ -406,8 +406,8 @@ def test_env_with_config():
_env_create('test', StringIO(test_config)) _env_create('test', StringIO(test_config))
e = ev.read('test') e = ev.read('test')
ev.prepare_config_scope(e) with e:
e.concretize() e.concretize()
assert any(x.satisfies('mpileaks@2.2') assert any(x.satisfies('mpileaks@2.2')
for x in e._get_environment_specs()) for x in e._get_environment_specs())
@ -431,8 +431,8 @@ def test_env_with_included_config_file():
version: [2.2] version: [2.2]
""") """)
ev.prepare_config_scope(e) with e:
e.concretize() e.concretize()
assert any(x.satisfies('mpileaks@2.2') assert any(x.satisfies('mpileaks@2.2')
for x in e._get_environment_specs()) for x in e._get_environment_specs())
@ -460,8 +460,8 @@ def test_env_with_included_config_scope():
version: [2.2] version: [2.2]
""") """)
ev.prepare_config_scope(e) with e:
e.concretize() e.concretize()
assert any(x.satisfies('mpileaks@2.2') assert any(x.satisfies('mpileaks@2.2')
for x in e._get_environment_specs()) for x in e._get_environment_specs())
@ -490,8 +490,8 @@ def test_env_config_precedence():
version: [0.8.11] version: [0.8.11]
""") """)
ev.prepare_config_scope(e) with e:
e.concretize() e.concretize()
# ensure included scope took effect # ensure included scope took effect
assert any( assert any(
@ -530,8 +530,8 @@ def test_included_config_precedence():
version: [0.8.12] version: [0.8.12]
""") """)
ev.prepare_config_scope(e) with e:
e.concretize() e.concretize()
assert any( assert any(
x.satisfies('mpileaks@2.2') for x in e._get_environment_specs()) x.satisfies('mpileaks@2.2') for x in e._get_environment_specs())