Fix pytest issues with this branch

This commit is contained in:
Dave Halter
2018-12-15 20:48:58 +01:00
parent 3ec78ba6c9
commit dc77c12e83
2 changed files with 4 additions and 4 deletions

View File

@@ -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

View File

@@ -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: