Skip to content

Remove dangerous sys.path manipulations in test_pluginmanager #3873

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 2 commits into from
Aug 26, 2018
Merged

Remove dangerous sys.path manipulations in test_pluginmanager #3873

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f872fcb
Remove dangerous sys.path manipulations in test_pluginmanager
nicoddemus Aug 25, 2018
b0541e9
Correctly restore sys.path in test and remove dead code in test_pytester
nicoddemus Aug 25, 2018
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
4 changes: 1 addition & 3 deletions testing/test_pluginmanager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ def pytest_myhook(xyz):
)
conf = testdir.makeconftest(
"""
import sys ; sys.path.insert(0, '.')
import newhooks
def pytest_addhooks(pluginmanager):
pluginmanager.addhooks(newhooks)
Expand Down Expand Up @@ -263,8 +262,7 @@ def test_consider_module_import_module(self, testdir):
mod.pytest_plugins = "pytest_a"
aplugin = testdir.makepyfile(pytest_a="#")
reprec = testdir.make_hook_recorder(pytestpm)
# syspath.prepend(aplugin.dirpath())
sys.path.insert(0, str(aplugin.dirpath()))
testdir.syspathinsert(aplugin.dirpath())
pytestpm.consider_module(mod)
call = reprec.getcall(pytestpm.hook.pytest_plugin_registered.name)
assert call.plugin.__name__ == "pytest_a"
Expand Down