Skip to content

Fix test failures in 0.28.0 with Jedi 0.13 #627

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jul 31, 2019
Merged

Fix test failures in 0.28.0 with Jedi 0.13 #627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8ef14e8
skip tests with versions of jedi <= 14.0
steff456 Jul 25, 2019
8bdca71
change order of imports
steff456 Jul 25, 2019
94f8fc9
remove str2tuple and add LooseVersion
steff456 Jul 30, 2019
b54368c
change order of imports
steff456 Jul 30, 2019
0d9c105
correct version of jedi
steff456 Jul 31, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions test/plugins/test_completion.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Copyright 2017 Palantir Technologies, Inc.
from distutils.version import LooseVersion
import os
import jedi
import pytest

from pyls import uris, lsp
from pyls.workspace import Document
Expand Down Expand Up @@ -42,6 +45,8 @@ def test_rope_import_completion(config, workspace):
assert items is None


@pytest.mark.skipif(LooseVersion(jedi.__version__) < LooseVersion('0.14.0'),
reason='This test fails with previous versions of jedi')
def test_jedi_completion(config):
# Over 'i' in os.path.isabs(...)
com_position = {'line': 1, 'character': 15}
Expand Down
7 changes: 7 additions & 0 deletions test/plugins/test_definitions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
# Copyright 2017 Palantir Technologies, Inc.
from distutils.version import LooseVersion
import jedi
import pytest

from pyls import uris
from pyls.plugins.definition import pyls_definitions
from pyls.workspace import Document


DOC_URI = uris.from_fs_path(__file__)
DOC = """def a():
pass
Expand Down Expand Up @@ -33,6 +38,8 @@ def test_definitions(config):
assert [{'uri': DOC_URI, 'range': def_range}] == pyls_definitions(config, doc, cursor_pos)


@pytest.mark.skipif(LooseVersion(jedi.__version__) < LooseVersion('0.14.0'),
reason='This test fails with previous versions of jedi')
def test_builtin_definition(config):
# Over 'i' in dict
cursor_pos = {'line': 8, 'character': 24}
Expand Down
6 changes: 6 additions & 0 deletions test/plugins/test_symbols.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
# Copyright 2017 Palantir Technologies, Inc.
from distutils.version import LooseVersion
import jedi
import pytest

from pyls import uris
from pyls.plugins.symbols import pyls_document_symbols
from pyls.lsp import SymbolKind
Expand All @@ -21,6 +25,8 @@ def main(x):
"""


@pytest.mark.skipif(LooseVersion(jedi.__version__) < LooseVersion('0.14.0'),
reason='This test fails with previous versions of jedi')
def test_symbols(config):
doc = Document(DOC_URI, DOC)
config.update({'plugins': {'jedi_symbols': {'all_scopes': False}}})
Expand Down