VimPlug/jedi-fork
1
0
Fork 0
forked from VimPlug/jedi
Code Pull Requests Activity

Fix skipped collection of pytest integration test files

Browse Source 
On integration tests file collection,
the value of `environment.executable` can also be a symlink
(e.g. in a virtualenv) with a different name than,
but pointing to the same as `sys.executable`
(e.g. .../bin/python3.10 and .../bin/python, respectively).

That causes skipping the collection of `completion/pytest.py`
and `completion/conftest.py` a lot of times, depending on the environment.
(e.g. "60 skipped" before x "23 skipped" after, in a local virtualenv)
This commit is contained in:
Marcio Mazza
2022-09-02 14:04:36 -03:00
parent 9e2089ef1e
commit fa0c064841
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
jedi/inference/references.py
View File

@@ -237,6 +237,7 @@ def recurse_find_python_folders_and_files(folder_io, except_paths=()):
for folder_io in folder_ios: for folder_io in folder_ios:
yield folder_io, None yield folder_io, None
def recurse_find_python_files(folder_io, except_paths=()): def recurse_find_python_files(folder_io, except_paths=()):
for folder_io, file_io in recurse_find_python_folders_and_files(folder_io, except_paths): for folder_io, file_io in recurse_find_python_folders_and_files(folder_io, except_paths):
if file_io is not None: if file_io is not None:

2
test/run.py
View File

@@ -209,7 +209,7 @@ class IntegrationTestCase(BaseTestCase):
TEST_REFERENCES: self.run_get_references, TEST_REFERENCES: self.run_get_references,
} }
if (self.path.endswith('pytest.py') or self.path.endswith('conftest.py')) \ if (self.path.endswith('pytest.py') or self.path.endswith('conftest.py')) \
and environment.executable != os.path.realpath(sys.executable): and os.path.realpath(environment.executable) != os.path.realpath(sys.executable):
# It's not guarantueed that pytest is installed in test # It's not guarantueed that pytest is installed in test
# environments, if we're not running in the same environment that # environments, if we're not running in the same environment that
# we're already in, so just skip that case. # we're already in, so just skip that case.