Fix test failures in 0.28.0 with Jedi 0.13 (#627)

palantir · Jul 31, 2019 · 9447bd7 · 9447bd7
1 parent 697ebb1
commit 9447bd7
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/test/plugins/test_completion.py b/test/plugins/test_completion.py
@@ -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
@@ -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}

diff --git a/test/plugins/test_definitions.py b/test/plugins/test_definitions.py
@@ -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
@@ -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}

diff --git a/test/plugins/test_symbols.py b/test/plugins/test_symbols.py
@@ -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
@@ -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}}})