diff --git a/pytest.ini b/pytest.ini index 5a5c090e..40a8d853 100644 --- a/pytest.ini +++ b/pytest.ini @@ -4,7 +4,7 @@ addopts = --doctest-modules # Ignore broken files in blackbox test directories norecursedirs = .* docs completion refactor namespace_package scripts extensions speed static_analysis not_in_sys_path - sample_venvs jedi/third_party + jedi/third_party # Activate `clean_jedi_cache` fixture for all tests. This should be # fine as long as we are using `clean_jedi_cache` as a session scoped diff --git a/test/test_inference/sample_venvs/pth_directory/dir-from-foo-pth/__init__.py b/test/examples/sample_venvs/pth_directory/dir-from-foo-pth/__init__.py similarity index 100% rename from test/test_inference/sample_venvs/pth_directory/dir-from-foo-pth/__init__.py rename to test/examples/sample_venvs/pth_directory/dir-from-foo-pth/__init__.py diff --git a/test/test_inference/sample_venvs/pth_directory/egg_link.egg-link b/test/examples/sample_venvs/pth_directory/egg_link.egg-link similarity index 100% rename from test/test_inference/sample_venvs/pth_directory/egg_link.egg-link rename to test/examples/sample_venvs/pth_directory/egg_link.egg-link diff --git a/test/test_inference/sample_venvs/pth_directory/foo.pth b/test/examples/sample_venvs/pth_directory/foo.pth similarity index 100% rename from test/test_inference/sample_venvs/pth_directory/foo.pth rename to test/examples/sample_venvs/pth_directory/foo.pth diff --git a/test/test_inference/sample_venvs/pth_directory/import_smth.pth b/test/examples/sample_venvs/pth_directory/import_smth.pth similarity index 100% rename from test/test_inference/sample_venvs/pth_directory/import_smth.pth rename to test/examples/sample_venvs/pth_directory/import_smth.pth diff --git a/test/test_inference/sample_venvs/pth_directory/relative.egg-link b/test/examples/sample_venvs/pth_directory/relative.egg-link similarity index 100% rename from test/test_inference/sample_venvs/pth_directory/relative.egg-link rename to test/examples/sample_venvs/pth_directory/relative.egg-link diff --git a/test/test_inference/sample_venvs/pth_directory/smth.py b/test/examples/sample_venvs/pth_directory/smth.py similarity index 100% rename from test/test_inference/sample_venvs/pth_directory/smth.py rename to test/examples/sample_venvs/pth_directory/smth.py diff --git a/test/test_inference/test_sys_path.py b/test/test_inference/test_sys_path.py index ad23e738..300d7935 100644 --- a/test/test_inference/test_sys_path.py +++ b/test/test_inference/test_sys_path.py @@ -4,8 +4,8 @@ import sys import shutil import pytest -from ..helpers import skip_if_windows, skip_if_not_windows +from ..helpers import skip_if_windows, skip_if_not_windows, get_example_dir from jedi.inference import sys_path from jedi.api.environment import create_environment @@ -32,14 +32,13 @@ def test_paths_from_assignment(Script): def test_venv_and_pths(venv_path): pjoin = os.path.join - CUR_DIR = os.path.dirname(__file__) site_pkg_path = pjoin(venv_path, 'lib') if os.name == 'nt': site_pkg_path = pjoin(site_pkg_path, 'site-packages') else: site_pkg_path = glob(pjoin(site_pkg_path, 'python*', 'site-packages'))[0] shutil.rmtree(site_pkg_path) - shutil.copytree(pjoin(CUR_DIR, 'sample_venvs', 'pth_directory'), site_pkg_path) + shutil.copytree(get_example_dir('sample_venvs', 'pth_directory'), site_pkg_path) virtualenv = create_environment(venv_path) venv_paths = virtualenv.get_sys_path()