VimPlug/jedi
1
0
Fork 1
mirror of https://github.com/davidhalter/jedi.git synced 2025-12-06 22:14:27 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1262 from hoefling/pytest-marks

Browse Source 
Use `pytest.param` when marking single parameters
This commit is contained in:
Dave Halter
2018-12-15 19:14:56 +01:00
committed by GitHub
parent 76417cc3c1 70800a6dc2
commit 078595f8d7
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
setup.py
View File

@@ -33,7 +33,7 @@ setup(name='jedi',
install_requires=install_requires, install_requires=install_requires,
extras_require={ extras_require={
'testing': [ 'testing': [
'pytest>=2.3.5', 'pytest>=3.1.0',
# docopt for sith doctests # docopt for sith doctests
'docopt', 'docopt',
# coloroma for colored debug output # coloroma for colored debug output

8
test/test_evaluate/test_imports.py
View File

@@ -87,10 +87,10 @@ def test_import_not_in_sys_path(Script):
("from flask.ext.", "bar"), ("from flask.ext.", "bar"),
("from flask.ext.", "baz"), ("from flask.ext.", "baz"),
("from flask.ext.", "moo"), ("from flask.ext.", "moo"),
pytest.mark.xfail(("import flask.ext.foo; flask.ext.foo.", "Foo")), pytest.param("import flask.ext.foo; flask.ext.foo.", "Foo", marks=pytest.mark.xfail),
pytest.mark.xfail(("import flask.ext.bar; flask.ext.bar.", "Foo")), pytest.param("import flask.ext.bar; flask.ext.bar.", "Foo", marks=pytest.mark.xfail),
pytest.mark.xfail(("import flask.ext.baz; flask.ext.baz.", "Foo")), pytest.param("import flask.ext.baz; flask.ext.baz.", "Foo", marks=pytest.mark.xfail),
pytest.mark.xfail(("import flask.ext.moo; flask.ext.moo.", "Foo")), pytest.param("import flask.ext.moo; flask.ext.moo.", "Foo", marks=pytest.mark.xfail),
]) ])
def test_flask_ext(Script, code, name): def test_flask_ext(Script, code, name):
"""flask.ext.foo is really imported from flaskext.foo or flask_foo. """flask.ext.foo is really imported from flaskext.foo or flask_foo.