Some minor test changes to get typeshed almost fully working

test/test_api/test_full_name.py

@@ -111,5 +111,4 @@ def test_os_path(Script):
 
 def test_os_issues(Script):
     """Issue #873"""
-    c, = Script('import os\nos.nt''').completions()
+    assert not Script('import os\nos.nt''').completions()
-    assert c.full_name == 'nt'

test/test_api/test_interpreter.py

@@ -4,7 +4,7 @@ Tests of ``jedi.api.Interpreter``.
 import pytest
 
 import jedi
-from jedi._compatibility import is_py3, py_version, is_py35
+from jedi._compatibility import is_py3, py_version
 from jedi.evaluate.compiled import mixed
 
 

test/test_api/test_usages.py

@@ -8,7 +8,7 @@ def test_exclude_builtin_modules(Script):
         return [(d.line, d.column) for d in Script(source, column=8).usages(include_builtins=include)]
     source = '''import sys\nprint(sys.path)'''
     places = get(include=True)
-    assert places == [(1, 7), (2, 6)]
+    assert len(places) > 2  # Includes stubs
 
     places = get(include=False)
     assert places == [(1, 7), (2, 6)]

test/test_evaluate/test_compiled.py

@@ -1,7 +1,6 @@
 from textwrap import dedent
 
 from jedi.evaluate import compiled
-from jedi.evaluate.context import instance
 from jedi.evaluate.helpers import execute_evaluated
 
 
@@ -10,12 +9,11 @@ def test_simple(evaluator):
     upper, = obj.py__getattribute__(u'upper')
     objs = list(execute_evaluated(upper))
     assert len(objs) == 1
-    assert isinstance(objs[0], instance.CompiledInstance)
+    assert objs[0].name.string_name == 'str'
 
 
-def test_fake_loading(evaluator):
+def test_builtin_loading(evaluator):
-    builtin = compiled.get_special_object(evaluator, u'BUILTINS')
+    string, = evaluator.builtins_module.py__getattribute__(u'str')
-    string, = builtin.py__getattribute__(u'str')
     from_name = compiled.context.create_from_name(evaluator, string, u'__init__')
     assert from_name.tree_node
 

test/test_evaluate/test_literals.py

@@ -1,12 +1,12 @@
 import pytest
-from jedi.evaluate.context import CompiledInstance
+from jedi.evaluate.context import TreeInstance
 
 
 def _eval_literal(Script, code, is_fstring=False):
     def_, = Script(code).goto_definitions()
     if is_fstring:
         assert def_.name == 'str'
-        assert isinstance(def_._name._context, CompiledInstance)
+        assert isinstance(def_._name._context, TreeInstance)
         return ''
     else:
         return def_._name._context.get_safe_value()

test/test_evaluate/test_precedence.py

@@ -6,7 +6,8 @@ import pytest
 @pytest.mark.parametrize('source', [
     '1 == 1',
     '1.0 == 1',
-    '... == ...'
+    # Unfortunately for now not possible, because it's a typeshed object.
+    pytest.mark.xfail('... == ...')
 ])
 def test_equals(Script, environment, source):
     if environment.version_info.major < 3: