From b847bb1c72dd797dc4fd0f7abbd2e0290cc2a90f Mon Sep 17 00:00:00 2001
From: Dave Halter <davidhalter88@gmail.com>
Date: Tue, 6 Nov 2018 09:00:07 +0100
Subject: [PATCH] Some minor test changes to get typeshed almost fully working

---
 test/test_api/test_full_name.py       | 3 +--
 test/test_api/test_interpreter.py     | 2 +-
 test/test_api/test_usages.py          | 2 +-
 test/test_evaluate/test_compiled.py   | 8 +++-----
 test/test_evaluate/test_literals.py   | 4 ++--
 test/test_evaluate/test_precedence.py | 3 ++-
 6 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/test/test_api/test_full_name.py b/test/test_api/test_full_name.py
index 1d9aec58..e4d9d34d 100644
--- a/test/test_api/test_full_name.py
+++ b/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 c.full_name == 'nt'
+    assert not Script('import os\nos.nt''').completions()
diff --git a/test/test_api/test_interpreter.py b/test/test_api/test_interpreter.py
index b1ca24bb..c8ca4137 100644
--- a/test/test_api/test_interpreter.py
+++ b/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
 
 
diff --git a/test/test_api/test_usages.py b/test/test_api/test_usages.py
index 65c0a588..245951b7 100644
--- a/test/test_api/test_usages.py
+++ b/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)]
diff --git a/test/test_evaluate/test_compiled.py b/test/test_evaluate/test_compiled.py
index 38d89a0d..e31a016f 100644
--- a/test/test_evaluate/test_compiled.py
+++ b/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):
-    builtin = compiled.get_special_object(evaluator, u'BUILTINS')
-    string, = builtin.py__getattribute__(u'str')
+def test_builtin_loading(evaluator):
+    string, = evaluator.builtins_module.py__getattribute__(u'str')
     from_name = compiled.context.create_from_name(evaluator, string, u'__init__')
     assert from_name.tree_node
 
diff --git a/test/test_evaluate/test_literals.py b/test/test_evaluate/test_literals.py
index 8ca9a9fc..dd72f8e8 100644
--- a/test/test_evaluate/test_literals.py
+++ b/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()
diff --git a/test/test_evaluate/test_precedence.py b/test/test_evaluate/test_precedence.py
index 722d2d05..e680aa3f 100644
--- a/test/test_evaluate/test_precedence.py
+++ b/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: