From 482b5e63db13300fc33e62ece1a6d2b12a4d3899 Mon Sep 17 00:00:00 2001 From: Dave Halter Date: Fri, 16 Feb 2018 15:00:53 +0100 Subject: [PATCH] Move the buildout_project stuff to a separate examples folder --- pytest.ini | 2 +- test/{test_evaluate => examples}/buildout_project/bin/app | 0 .../buildout_project/bin/binary_file | 0 .../buildout_project/bin/empty_file | 0 .../buildout_project/buildout.cfg | 0 .../buildout_project/src/proj_name/module_name.py | 0 test/test_evaluate/test_buildout_detection.py | 8 ++++---- 7 files changed, 5 insertions(+), 5 deletions(-) rename test/{test_evaluate => examples}/buildout_project/bin/app (100%) rename test/{test_evaluate => examples}/buildout_project/bin/binary_file (100%) rename test/{test_evaluate => examples}/buildout_project/bin/empty_file (100%) rename test/{test_evaluate => examples}/buildout_project/buildout.cfg (100%) rename test/{test_evaluate => examples}/buildout_project/src/proj_name/module_name.py (100%) diff --git a/pytest.ini b/pytest.ini index fd74c60d..d4e0f467 100644 --- a/pytest.ini +++ b/pytest.ini @@ -3,7 +3,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 + scripts extensions speed static_analysis not_in_sys_path sample_venvs init_extension_module simple_import # Activate `clean_jedi_cache` fixture for all tests. This should be diff --git a/test/test_evaluate/buildout_project/bin/app b/test/examples/buildout_project/bin/app similarity index 100% rename from test/test_evaluate/buildout_project/bin/app rename to test/examples/buildout_project/bin/app diff --git a/test/test_evaluate/buildout_project/bin/binary_file b/test/examples/buildout_project/bin/binary_file similarity index 100% rename from test/test_evaluate/buildout_project/bin/binary_file rename to test/examples/buildout_project/bin/binary_file diff --git a/test/test_evaluate/buildout_project/bin/empty_file b/test/examples/buildout_project/bin/empty_file similarity index 100% rename from test/test_evaluate/buildout_project/bin/empty_file rename to test/examples/buildout_project/bin/empty_file diff --git a/test/test_evaluate/buildout_project/buildout.cfg b/test/examples/buildout_project/buildout.cfg similarity index 100% rename from test/test_evaluate/buildout_project/buildout.cfg rename to test/examples/buildout_project/buildout.cfg diff --git a/test/test_evaluate/buildout_project/src/proj_name/module_name.py b/test/examples/buildout_project/src/proj_name/module_name.py similarity index 100% rename from test/test_evaluate/buildout_project/src/proj_name/module_name.py rename to test/examples/buildout_project/src/proj_name/module_name.py diff --git a/test/test_evaluate/test_buildout_detection.py b/test/test_evaluate/test_buildout_detection.py index e1892c85..622ded23 100644 --- a/test/test_evaluate/test_buildout_detection.py +++ b/test/test_evaluate/test_buildout_detection.py @@ -14,15 +14,15 @@ def check_module_test(Script, code): return check_sys_path_modifications(module_context) -@cwd_at('test/test_evaluate/buildout_project/src/proj_name') +@cwd_at('test/examples/buildout_project/src/proj_name') def test_parent_dir_with_file(Script): parent = _get_parent_dir_with_file( os.path.abspath(os.curdir), 'buildout.cfg') assert parent is not None - assert parent.endswith(os.path.join('test', 'test_evaluate', 'buildout_project')) + assert parent.endswith(os.path.join('test', 'examples', 'buildout_project')) -@cwd_at('test/test_evaluate/buildout_project/src/proj_name') +@cwd_at('test/examples/buildout_project/src/proj_name') def test_buildout_detection(Script): scripts = list(_get_buildout_script_paths(os.path.abspath('./module_name.py'))) assert len(scripts) == 1 @@ -56,7 +56,7 @@ def test_path_from_invalid_sys_path_assignment(Script): assert 'invalid' not in paths -@cwd_at('test/test_evaluate/buildout_project/src/proj_name/') +@cwd_at('test/examples/buildout_project/src/proj_name/') def test_sys_path_with_modifications(Script): code = dedent(""" import os