diff --git a/test/completion/on_import.py b/test/completion/on_import.py index ddf04151..91524df8 100644 --- a/test/completion/on_import.py +++ b/test/completion/on_import.py @@ -23,11 +23,9 @@ def builtin_test(): import sqlite3 # classes is a local module that has an __init__.py and can therefore not be -# found. test can be found. +# found. #? [] import classes -#? ['test'] -import test #? ['timedelta'] from datetime import timedel diff --git a/test/run.py b/test/run.py index e9c8ab09..40b7e15a 100755 --- a/test/run.py +++ b/test/run.py @@ -108,6 +108,7 @@ from ast import literal_eval from io import StringIO from functools import reduce from unittest.mock import ANY +from pathlib import Path import parso from _pytest.outcomes import Skipped @@ -122,6 +123,7 @@ from jedi.api.environment import get_default_environment, get_system_environment from jedi.inference.gradual.conversion import convert_values from jedi.inference.analysis import Warning +test_dir = Path(__file__).absolute().parent TEST_COMPLETIONS = 0 TEST_INFERENCE = 1 @@ -173,6 +175,7 @@ class IntegrationTestCase(BaseTestCase): self.start = start self.line = line self.path = path + self._project = jedi.Project(test_dir) @property def module_name(self): @@ -188,7 +191,12 @@ class IntegrationTestCase(BaseTestCase): self.line_nr_test, self.line.rstrip()) def script(self, environment): - return jedi.Script(self.source, path=self.path, environment=environment) + return jedi.Script( + self.source, + path=self.path, + environment=environment, + project=self._project + ) def run(self, compare_cb, environment=None): testers = { @@ -263,7 +271,7 @@ class IntegrationTestCase(BaseTestCase): self.correct = self.correct.strip() compare = sorted( (('stub:' if r.is_stub() else '') - + re.sub(r'^test\.completion\.', '', r.module_name), + + re.sub(r'^completion\.', '', r.module_name), r.line, r.column) for r in result