jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hollow out pytest_namespace in _pytest.fixtures

This commit is contained in:
Ronny Pfannschmidt 2017-02-28 17:33:54 +01:00
parent 9b58d6eaca
commit 61f418a267
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
_pytest/fixtures.py
View File

@ -51,9 +51,7 @@ def pytest_namespace():
'module': pytest.Module, 'module': pytest.Module,
'function': pytest.Item, 'function': pytest.Item,
}) })
return { return {}
'collect': {'_fillfuncargs': fillfixtures}
}
def get_scope_node(node, scope): def get_scope_node(node, scope):

1
pytest.py
View File

@ -45,6 +45,7 @@ from _pytest.recwarn import warns, deprecated_call
from _pytest.runner import fail, skip, importorskip, exit from _pytest.runner import fail, skip, importorskip, exit
from _pytest.mark import MARK_GEN as mark from _pytest.mark import MARK_GEN as mark
from _pytest.skipping import xfail from _pytest.skipping import xfail
from _pytest.fixtures import fillfixtures as _fillfuncargs
set_trace = __pytestPDB.set_trace set_trace = __pytestPDB.set_trace