Skip to content

[ci] Ensure that module paths are restored correctly in unit tests #1655

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Dec 15, 2020
Merged

[ci] Ensure that module paths are restored correctly in unit tests #1655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f3c17bc
Ensure that module paths are restored in tests
Dec 14, 2020
818b114
Address PR comments
Dec 15, 2020
75dde7f
Remove stale comment lines
Dec 15, 2020
2e8a8f4
Merge branch 'master' into bugfix/unittest_module_cleanup
Dec 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
importlib_metadata==2.0.0
jsonschema==3.2.0
pytest==6.1.1
pytest==6.2.0
pytest-forked==1.3.0
pytest-parallel==0.1.0
coverage==5.3
Expand Down
3 changes: 1 addition & 2 deletions unittests/test_cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -671,6 +671,7 @@ def test_unuse_module_path(run_reframe, user_exec_ctx):
config_file=fixtures.USER_CONFIG_FILE, action='run',
system=rt.runtime().system.name
)
ms.searchpath_remove(module_path)
assert "could not load module 'testmod_foo' correctly" in stdout
assert 'Traceback' not in stderr
assert returncode == 0
Expand All @@ -687,7 +688,6 @@ def test_use_module_path(run_reframe, user_exec_ctx):
config_file=fixtures.USER_CONFIG_FILE, action='run',
system=rt.runtime().system.name
)

assert 'Traceback' not in stdout
assert 'Traceback' not in stderr
assert "could not load module 'testmod_foo' correctly" not in stdout
Expand All @@ -708,7 +708,6 @@ def test_overwrite_module_path(run_reframe, user_exec_ctx):
config_file=fixtures.USER_CONFIG_FILE, action='run',
system=rt.runtime().system.name
)

assert 'Traceback' not in stdout
assert 'Traceback' not in stderr
assert "could not load module 'testmod_foo' correctly" not in stdout
Expand Down
3 changes: 2 additions & 1 deletion unittests/test_utility.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1414,7 +1414,8 @@ def modules_system(user_exec_ctx, monkeypatch):

ms = rt.runtime().system.modules_system
ms.searchpath_add(fixtures.TEST_MODULES)
return ms
yield ms
ms.searchpath_remove(fixtures.TEST_MODULES)


def test_find_modules(modules_system):
Expand Down