floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove the namespace hook from mark after the param feature merge

This commit is contained in:
Ronny Pfannschmidt 2017-03-20 17:58:34 +01:00
parent 6165939b0d
commit ebeba79be3
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
_pytest/mark.py
View File

@ -66,10 +66,8 @@ class MarkerError(Exception):
"""Error in use of a pytest marker/attribute.""" """Error in use of a pytest marker/attribute."""
def pytest_namespace(): def param(*values, **kw):
return { return ParameterSet.param(*values, **kw)
'param': ParameterSet.param,
}
def pytest_addoption(parser): def pytest_addoption(parser):

3
pytest.py
View File

@ -17,7 +17,7 @@ from _pytest import __version__
from _pytest.debugging import pytestPDB as __pytestPDB from _pytest.debugging import pytestPDB as __pytestPDB
from _pytest.recwarn import warns, deprecated_call 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, param
from _pytest.skipping import xfail from _pytest.skipping import xfail
from _pytest.main import Item, Collector, File, Session from _pytest.main import Item, Collector, File, Session
from _pytest.fixtures import fillfixtures as _fillfuncargs from _pytest.fixtures import fillfixtures as _fillfuncargs
@ -48,6 +48,7 @@ __all__ = [
'importorskip', 'importorskip',
'exit', 'exit',
'mark', 'mark',
'param',
'approx', 'approx',
'_fillfuncargs', '_fillfuncargs',