From dc77c12e838da71d3d2b60439cead2e2f2034223 Mon Sep 17 00:00:00 2001 From: Dave Halter Date: Sat, 15 Dec 2018 20:48:58 +0100 Subject: [PATCH] Fix pytest issues with this branch --- pytest.ini | 2 +- test/test_evaluate/test_precedence.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pytest.ini b/pytest.ini index 9c4bb320..b855612c 100644 --- a/pytest.ini +++ b/pytest.ini @@ -4,7 +4,7 @@ addopts = --doctest-modules # Ignore broken files in blackbox test directories norecursedirs = .* docs completion refactor absolute_import namespace_package scripts extensions speed static_analysis not_in_sys_path - sample_venvs init_extension_module simple_import jedi/typeshed + sample_venvs init_extension_module simple_import jedi/third_party # Activate `clean_jedi_cache` fixture for all tests. This should be # fine as long as we are using `clean_jedi_cache` as a session scoped diff --git a/test/test_evaluate/test_precedence.py b/test/test_evaluate/test_precedence.py index e680aa3f..2e97119e 100644 --- a/test/test_evaluate/test_precedence.py +++ b/test/test_evaluate/test_precedence.py @@ -4,10 +4,10 @@ import pytest @pytest.mark.parametrize('source', [ - '1 == 1', - '1.0 == 1', + pytest.param('1 == 1'), + pytest.param('1.0 == 1'), # Unfortunately for now not possible, because it's a typeshed object. - pytest.mark.xfail('... == ...') + pytest.param('... == ...', marks=pytest.mark.xfail), ]) def test_equals(Script, environment, source): if environment.version_info.major < 3: