diff options
Diffstat (limited to 'lib/spack/spack/test/cmd/module.py')
| -rw-r--r-- | lib/spack/spack/test/cmd/module.py | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/lib/spack/spack/test/cmd/module.py b/lib/spack/spack/test/cmd/module.py index ec11ed2d65..0ff7cb78a6 100644 --- a/lib/spack/spack/test/cmd/module.py +++ b/lib/spack/spack/test/cmd/module.py @@ -149,16 +149,20 @@ def test_find_recursive(): @pytest.mark.db -def test_find_recursive_blacklisted(database, module_configuration): - module_configuration('blacklist') +# DEPRECATED: remove blacklist in v0.20 +@pytest.mark.parametrize("config_name", ["exclude", "blacklist"]) +def test_find_recursive_excluded(database, module_configuration, config_name): + module_configuration(config_name) module('lmod', 'refresh', '-y', '--delete-tree') module('lmod', 'find', '-r', 'mpileaks ^mpich') @pytest.mark.db -def test_loads_recursive_blacklisted(database, module_configuration): - module_configuration('blacklist') +# DEPRECATED: remove blacklist in v0.20 +@pytest.mark.parametrize("config_name", ["exclude", "blacklist"]) +def test_loads_recursive_excluded(database, module_configuration, config_name): + module_configuration(config_name) module('lmod', 'refresh', '-y', '--delete-tree') output = module('lmod', 'loads', '-r', 'mpileaks ^mpich') @@ -166,7 +170,7 @@ def test_loads_recursive_blacklisted(database, module_configuration): assert any(re.match(r'[^#]*module load.*mpileaks', ln) for ln in lines) assert not any(re.match(r'[^#]module load.*callpath', ln) for ln in lines) - assert any(re.match(r'## blacklisted or missing.*callpath', ln) + assert any(re.match(r'## excluded or missing.*callpath', ln) for ln in lines) # TODO: currently there is no way to separate stdout and stderr when |