zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix leaky tests (#27616)

Browse Source 
* fix: cc.py should use a function not session scope
* fix: don't let build env vars leak to other tests
* fix: don't leak build env in dev_build test
This commit is contained in:
Harmen Stoppels 2021-11-23 23:10:48 +01:00 committed by GitHub
parent 2d20e557df
commit cced832cac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/spack/spack/test/cc.py
View File

@ -102,7 +102,7 @@
) )
@pytest.fixture(scope='session') @pytest.fixture(scope='function')
def wrapper_environment(): def wrapper_environment():
with set_env( with set_env(
SPACK_CC=real_cc, SPACK_CC=real_cc,

10
lib/spack/spack/test/cmd/build_env.py
View File

@ -15,12 +15,12 @@
('zlib',), ('zlib',),
('zlib', '--') ('zlib', '--')
]) ])
@pytest.mark.usefixtures('config') @pytest.mark.usefixtures('config', 'mock_packages', 'working_env')
def test_it_just_runs(pkg): def test_it_just_runs(pkg):
build_env(*pkg) build_env(*pkg)
@pytest.mark.usefixtures('config') @pytest.mark.usefixtures('config', 'mock_packages', 'working_env')
def test_error_when_multiple_specs_are_given(): def test_error_when_multiple_specs_are_given():
output = build_env('libelf libdwarf', fail_on_error=False) output = build_env('libelf libdwarf', fail_on_error=False)
assert 'only takes one spec' in output assert 'only takes one spec' in output
@ -31,7 +31,7 @@ def test_error_when_multiple_specs_are_given():
('--',), ('--',),
(), (),
]) ])
@pytest.mark.usefixtures('config') @pytest.mark.usefixtures('config', 'mock_packages', 'working_env')
def test_build_env_requires_a_spec(args): def test_build_env_requires_a_spec(args):
output = build_env(*args, fail_on_error=False) output = build_env(*args, fail_on_error=False)
assert 'requires a spec' in output assert 'requires a spec' in output
@ -40,7 +40,7 @@ def test_build_env_requires_a_spec(args):
_out_file = 'env.out' _out_file = 'env.out'
@pytest.mark.usefixtures('config') @pytest.mark.usefixtures('config', 'mock_packages', 'working_env')
def test_dump(tmpdir): def test_dump(tmpdir):
with tmpdir.as_cwd(): with tmpdir.as_cwd():
build_env('--dump', _out_file, 'zlib') build_env('--dump', _out_file, 'zlib')
@ -48,7 +48,7 @@ def test_dump(tmpdir):
assert(any(line.startswith('PATH=') for line in f.readlines())) assert(any(line.startswith('PATH=') for line in f.readlines()))
@pytest.mark.usefixtures('config') @pytest.mark.usefixtures('config', 'mock_packages', 'working_env')
def test_pickle(tmpdir): def test_pickle(tmpdir):
with tmpdir.as_cwd(): with tmpdir.as_cwd():
build_env('--pickle', _out_file, 'zlib') build_env('--pickle', _out_file, 'zlib')

2
lib/spack/spack/test/cmd/dev_build.py
View File

@ -134,7 +134,7 @@ def mock_module_noop(*args):
def test_dev_build_drop_in(tmpdir, mock_packages, monkeypatch, def test_dev_build_drop_in(tmpdir, mock_packages, monkeypatch,
install_mockery): install_mockery, working_env):
monkeypatch.setattr(os, 'execvp', print_spack_cc) monkeypatch.setattr(os, 'execvp', print_spack_cc)
monkeypatch.setattr(spack.build_environment, 'module', mock_module_noop) monkeypatch.setattr(spack.build_environment, 'module', mock_module_noop)