forked from VimPlug/jedi
Merge with master
The deprecation of Python2.6 and the insertion of environments made it quite difficult to merge.
This commit is contained in:
@@ -5,7 +5,6 @@ with "Black Box Tests".
|
||||
from textwrap import dedent
|
||||
|
||||
import pytest
|
||||
from jedi._compatibility import is_py26
|
||||
|
||||
|
||||
# The namedtuple is different for different Python2.7 versions. Some versions
|
||||
@@ -28,10 +27,7 @@ def test_namedtuple_str(letter, expected, Script):
|
||||
dave.%s""") % letter
|
||||
result = Script(source).completions()
|
||||
completions = set(r.name for r in result)
|
||||
if is_py26:
|
||||
assert completions == set()
|
||||
else:
|
||||
assert completions == set(expected)
|
||||
assert completions == set(expected)
|
||||
|
||||
|
||||
def test_namedtuple_list(Script):
|
||||
@@ -42,10 +38,7 @@ def test_namedtuple_list(Script):
|
||||
garfield.l""")
|
||||
result = Script(source).completions()
|
||||
completions = set(r.name for r in result)
|
||||
if is_py26:
|
||||
assert completions == set()
|
||||
else:
|
||||
assert completions == set(['legs', 'length', 'large'])
|
||||
assert completions == {'legs', 'length', 'large'}
|
||||
|
||||
|
||||
def test_namedtuple_content(Script):
|
||||
|
||||
Reference in New Issue
Block a user