From f50045710037eccf287a4736c04bfdc57390961d Mon Sep 17 00:00:00 2001 From: immerrr Date: Wed, 21 Oct 2015 08:29:53 +0300 Subject: [PATCH] sample_venvs: exclude venvs dir from py.test discovery --- pytest.ini | 2 +- .../python2.7/site-packages/dir-from-foo-pth/__init__.py | 0 .../venv27/lib/python2.7/site-packages/egg_link.egg-link | 0 .../venv27/lib/python2.7/site-packages/foo.pth | 0 .../venv27/lib/python2.7/site-packages/import_smth.pth | 0 .../venv27/lib/python2.7/site-packages/relative.egg-link | 0 .../venv27/lib/python2.7/site-packages/smth.py | 0 .../python3.4/site-packages/dir-from-foo-pth/__init__.py | 0 .../venv34/lib/python3.4/site-packages/egg_link.egg-link | 0 .../venv34/lib/python3.4/site-packages/foo.pth | 0 .../venv34/lib/python3.4/site-packages/import_smth.pth | 0 .../venv34/lib/python3.4/site-packages/relative.egg-link | 0 .../venv34/lib/python3.4/site-packages/smth.py | 0 test/test_evaluate/test_sys_path.py | 6 ++++-- 14 files changed, 5 insertions(+), 3 deletions(-) rename test/test_evaluate/{venvs => sample_venvs}/venv27/lib/python2.7/site-packages/dir-from-foo-pth/__init__.py (100%) rename test/test_evaluate/{venvs => sample_venvs}/venv27/lib/python2.7/site-packages/egg_link.egg-link (100%) rename test/test_evaluate/{venvs => sample_venvs}/venv27/lib/python2.7/site-packages/foo.pth (100%) rename test/test_evaluate/{venvs => sample_venvs}/venv27/lib/python2.7/site-packages/import_smth.pth (100%) rename test/test_evaluate/{venvs => sample_venvs}/venv27/lib/python2.7/site-packages/relative.egg-link (100%) rename test/test_evaluate/{venvs => sample_venvs}/venv27/lib/python2.7/site-packages/smth.py (100%) rename test/test_evaluate/{venvs => sample_venvs}/venv34/lib/python3.4/site-packages/dir-from-foo-pth/__init__.py (100%) rename test/test_evaluate/{venvs => sample_venvs}/venv34/lib/python3.4/site-packages/egg_link.egg-link (100%) rename test/test_evaluate/{venvs => sample_venvs}/venv34/lib/python3.4/site-packages/foo.pth (100%) rename test/test_evaluate/{venvs => sample_venvs}/venv34/lib/python3.4/site-packages/import_smth.pth (100%) rename test/test_evaluate/{venvs => sample_venvs}/venv34/lib/python3.4/site-packages/relative.egg-link (100%) rename test/test_evaluate/{venvs => sample_venvs}/venv34/lib/python3.4/site-packages/smth.py (100%) diff --git a/pytest.ini b/pytest.ini index 3a066302..6fafa946 100644 --- a/pytest.ini +++ b/pytest.ini @@ -2,7 +2,7 @@ addopts = --doctest-modules # Ignore broken files in blackbox test directories -norecursedirs = .* docs completion refactor absolute_import namespace_package scripts extensions speed static_analysis not_in_sys_path buildout_project egg-link init_extension_module +norecursedirs = .* docs completion refactor absolute_import namespace_package scripts extensions speed static_analysis not_in_sys_path buildout_project sample_venvs init_extension_module # 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_evaluate/venvs/venv27/lib/python2.7/site-packages/dir-from-foo-pth/__init__.py b/test/test_evaluate/sample_venvs/venv27/lib/python2.7/site-packages/dir-from-foo-pth/__init__.py similarity index 100% rename from test/test_evaluate/venvs/venv27/lib/python2.7/site-packages/dir-from-foo-pth/__init__.py rename to test/test_evaluate/sample_venvs/venv27/lib/python2.7/site-packages/dir-from-foo-pth/__init__.py diff --git a/test/test_evaluate/venvs/venv27/lib/python2.7/site-packages/egg_link.egg-link b/test/test_evaluate/sample_venvs/venv27/lib/python2.7/site-packages/egg_link.egg-link similarity index 100% rename from test/test_evaluate/venvs/venv27/lib/python2.7/site-packages/egg_link.egg-link rename to test/test_evaluate/sample_venvs/venv27/lib/python2.7/site-packages/egg_link.egg-link diff --git a/test/test_evaluate/venvs/venv27/lib/python2.7/site-packages/foo.pth b/test/test_evaluate/sample_venvs/venv27/lib/python2.7/site-packages/foo.pth similarity index 100% rename from test/test_evaluate/venvs/venv27/lib/python2.7/site-packages/foo.pth rename to test/test_evaluate/sample_venvs/venv27/lib/python2.7/site-packages/foo.pth diff --git a/test/test_evaluate/venvs/venv27/lib/python2.7/site-packages/import_smth.pth b/test/test_evaluate/sample_venvs/venv27/lib/python2.7/site-packages/import_smth.pth similarity index 100% rename from test/test_evaluate/venvs/venv27/lib/python2.7/site-packages/import_smth.pth rename to test/test_evaluate/sample_venvs/venv27/lib/python2.7/site-packages/import_smth.pth diff --git a/test/test_evaluate/venvs/venv27/lib/python2.7/site-packages/relative.egg-link b/test/test_evaluate/sample_venvs/venv27/lib/python2.7/site-packages/relative.egg-link similarity index 100% rename from test/test_evaluate/venvs/venv27/lib/python2.7/site-packages/relative.egg-link rename to test/test_evaluate/sample_venvs/venv27/lib/python2.7/site-packages/relative.egg-link diff --git a/test/test_evaluate/venvs/venv27/lib/python2.7/site-packages/smth.py b/test/test_evaluate/sample_venvs/venv27/lib/python2.7/site-packages/smth.py similarity index 100% rename from test/test_evaluate/venvs/venv27/lib/python2.7/site-packages/smth.py rename to test/test_evaluate/sample_venvs/venv27/lib/python2.7/site-packages/smth.py diff --git a/test/test_evaluate/venvs/venv34/lib/python3.4/site-packages/dir-from-foo-pth/__init__.py b/test/test_evaluate/sample_venvs/venv34/lib/python3.4/site-packages/dir-from-foo-pth/__init__.py similarity index 100% rename from test/test_evaluate/venvs/venv34/lib/python3.4/site-packages/dir-from-foo-pth/__init__.py rename to test/test_evaluate/sample_venvs/venv34/lib/python3.4/site-packages/dir-from-foo-pth/__init__.py diff --git a/test/test_evaluate/venvs/venv34/lib/python3.4/site-packages/egg_link.egg-link b/test/test_evaluate/sample_venvs/venv34/lib/python3.4/site-packages/egg_link.egg-link similarity index 100% rename from test/test_evaluate/venvs/venv34/lib/python3.4/site-packages/egg_link.egg-link rename to test/test_evaluate/sample_venvs/venv34/lib/python3.4/site-packages/egg_link.egg-link diff --git a/test/test_evaluate/venvs/venv34/lib/python3.4/site-packages/foo.pth b/test/test_evaluate/sample_venvs/venv34/lib/python3.4/site-packages/foo.pth similarity index 100% rename from test/test_evaluate/venvs/venv34/lib/python3.4/site-packages/foo.pth rename to test/test_evaluate/sample_venvs/venv34/lib/python3.4/site-packages/foo.pth diff --git a/test/test_evaluate/venvs/venv34/lib/python3.4/site-packages/import_smth.pth b/test/test_evaluate/sample_venvs/venv34/lib/python3.4/site-packages/import_smth.pth similarity index 100% rename from test/test_evaluate/venvs/venv34/lib/python3.4/site-packages/import_smth.pth rename to test/test_evaluate/sample_venvs/venv34/lib/python3.4/site-packages/import_smth.pth diff --git a/test/test_evaluate/venvs/venv34/lib/python3.4/site-packages/relative.egg-link b/test/test_evaluate/sample_venvs/venv34/lib/python3.4/site-packages/relative.egg-link similarity index 100% rename from test/test_evaluate/venvs/venv34/lib/python3.4/site-packages/relative.egg-link rename to test/test_evaluate/sample_venvs/venv34/lib/python3.4/site-packages/relative.egg-link diff --git a/test/test_evaluate/venvs/venv34/lib/python3.4/site-packages/smth.py b/test/test_evaluate/sample_venvs/venv34/lib/python3.4/site-packages/smth.py similarity index 100% rename from test/test_evaluate/venvs/venv34/lib/python3.4/site-packages/smth.py rename to test/test_evaluate/sample_venvs/venv34/lib/python3.4/site-packages/smth.py diff --git a/test/test_evaluate/test_sys_path.py b/test/test_evaluate/test_sys_path.py index f28c2021..44997100 100644 --- a/test/test_evaluate/test_sys_path.py +++ b/test/test_evaluate/test_sys_path.py @@ -30,8 +30,8 @@ def test_paths_from_assignment(): # invoked with one of those versions, the test below will be run for the # matching directory. CUR_DIR = os.path.dirname(__file__) -VENVS = list(glob(os.path.join(CUR_DIR, - 'venvs/venv%d%d' % sys.version_info[:2]))) +VENVS = list(glob( + os.path.join(CUR_DIR, 'sample_venvs/venv%d%d' % sys.version_info[:2]))) @pytest.mark.parametrize('venv', VENVS) @@ -49,4 +49,6 @@ def test_get_venv_path(venv): pjoin('/path', 'from', 'smth.py'), pjoin('/path', 'from', 'smth.py:extend_path') ] + # Ensure that none of venv dirs leaked to the interpreter. + assert not set(sys.path).intersection(ETALON) assert venv_path[:len(ETALON)] == ETALON