diff --git a/test/test_evaluate/__init__.py b/test/test_inference/__init__.py similarity index 100% rename from test/test_evaluate/__init__.py rename to test/test_inference/__init__.py diff --git a/test/test_evaluate/absolute_import/local_module.py b/test/test_inference/absolute_import/local_module.py similarity index 100% rename from test/test_evaluate/absolute_import/local_module.py rename to test/test_inference/absolute_import/local_module.py diff --git a/test/test_evaluate/absolute_import/unittest.py b/test/test_inference/absolute_import/unittest.py similarity index 100% rename from test/test_evaluate/absolute_import/unittest.py rename to test/test_inference/absolute_import/unittest.py diff --git a/test/test_evaluate/flask-site-packages/flask/__init__.py b/test/test_inference/flask-site-packages/flask/__init__.py similarity index 100% rename from test/test_evaluate/flask-site-packages/flask/__init__.py rename to test/test_inference/flask-site-packages/flask/__init__.py diff --git a/test/test_evaluate/flask-site-packages/flask/ext/__init__.py b/test/test_inference/flask-site-packages/flask/ext/__init__.py similarity index 100% rename from test/test_evaluate/flask-site-packages/flask/ext/__init__.py rename to test/test_inference/flask-site-packages/flask/ext/__init__.py diff --git a/test/test_evaluate/flask-site-packages/flask_baz/__init__.py b/test/test_inference/flask-site-packages/flask_baz/__init__.py similarity index 100% rename from test/test_evaluate/flask-site-packages/flask_baz/__init__.py rename to test/test_inference/flask-site-packages/flask_baz/__init__.py diff --git a/test/test_evaluate/flask-site-packages/flask_foo.py b/test/test_inference/flask-site-packages/flask_foo.py similarity index 100% rename from test/test_evaluate/flask-site-packages/flask_foo.py rename to test/test_inference/flask-site-packages/flask_foo.py diff --git a/test/test_evaluate/flask-site-packages/flaskext/__init__.py b/test/test_inference/flask-site-packages/flaskext/__init__.py similarity index 100% rename from test/test_evaluate/flask-site-packages/flaskext/__init__.py rename to test/test_inference/flask-site-packages/flaskext/__init__.py diff --git a/test/test_evaluate/flask-site-packages/flaskext/bar.py b/test/test_inference/flask-site-packages/flaskext/bar.py similarity index 100% rename from test/test_evaluate/flask-site-packages/flaskext/bar.py rename to test/test_inference/flask-site-packages/flaskext/bar.py diff --git a/test/test_evaluate/flask-site-packages/flaskext/moo/__init__.py b/test/test_inference/flask-site-packages/flaskext/moo/__init__.py similarity index 100% rename from test/test_evaluate/flask-site-packages/flaskext/moo/__init__.py rename to test/test_inference/flask-site-packages/flaskext/moo/__init__.py diff --git a/test/test_evaluate/implicit_namespace_package/ns1/pkg/ns1_file.py b/test/test_inference/implicit_namespace_package/ns1/pkg/ns1_file.py similarity index 100% rename from test/test_evaluate/implicit_namespace_package/ns1/pkg/ns1_file.py rename to test/test_inference/implicit_namespace_package/ns1/pkg/ns1_file.py diff --git a/test/test_evaluate/implicit_namespace_package/ns2/pkg/ns2_file.py b/test/test_inference/implicit_namespace_package/ns2/pkg/ns2_file.py similarity index 100% rename from test/test_evaluate/implicit_namespace_package/ns2/pkg/ns2_file.py rename to test/test_inference/implicit_namespace_package/ns2/pkg/ns2_file.py diff --git a/test/test_evaluate/implicit_nested_namespaces/namespace/pkg/module.py b/test/test_inference/implicit_nested_namespaces/namespace/pkg/module.py similarity index 100% rename from test/test_evaluate/implicit_nested_namespaces/namespace/pkg/module.py rename to test/test_inference/implicit_nested_namespaces/namespace/pkg/module.py diff --git a/test/test_evaluate/init_extension_module/__init__.cpython-34m.so b/test/test_inference/init_extension_module/__init__.cpython-34m.so similarity index 100% rename from test/test_evaluate/init_extension_module/__init__.cpython-34m.so rename to test/test_inference/init_extension_module/__init__.cpython-34m.so diff --git a/test/test_evaluate/init_extension_module/module.c b/test/test_inference/init_extension_module/module.c similarity index 100% rename from test/test_evaluate/init_extension_module/module.c rename to test/test_inference/init_extension_module/module.c diff --git a/test/test_evaluate/init_extension_module/setup.py b/test/test_inference/init_extension_module/setup.py similarity index 100% rename from test/test_evaluate/init_extension_module/setup.py rename to test/test_inference/init_extension_module/setup.py diff --git a/test/test_evaluate/namespace_package/ns1/pkg/__init__.py b/test/test_inference/namespace_package/ns1/pkg/__init__.py similarity index 100% rename from test/test_evaluate/namespace_package/ns1/pkg/__init__.py rename to test/test_inference/namespace_package/ns1/pkg/__init__.py diff --git a/test/test_evaluate/namespace_package/ns1/pkg/ns1_file.py b/test/test_inference/namespace_package/ns1/pkg/ns1_file.py similarity index 100% rename from test/test_evaluate/namespace_package/ns1/pkg/ns1_file.py rename to test/test_inference/namespace_package/ns1/pkg/ns1_file.py diff --git a/test/test_evaluate/namespace_package/ns1/pkg/ns1_folder/__init__.py b/test/test_inference/namespace_package/ns1/pkg/ns1_folder/__init__.py similarity index 100% rename from test/test_evaluate/namespace_package/ns1/pkg/ns1_folder/__init__.py rename to test/test_inference/namespace_package/ns1/pkg/ns1_folder/__init__.py diff --git a/test/test_evaluate/namespace_package/ns2/pkg/ns2_file.py b/test/test_inference/namespace_package/ns2/pkg/ns2_file.py similarity index 100% rename from test/test_evaluate/namespace_package/ns2/pkg/ns2_file.py rename to test/test_inference/namespace_package/ns2/pkg/ns2_file.py diff --git a/test/test_evaluate/namespace_package/ns2/pkg/ns2_folder/__init__.py b/test/test_inference/namespace_package/ns2/pkg/ns2_folder/__init__.py similarity index 100% rename from test/test_evaluate/namespace_package/ns2/pkg/ns2_folder/__init__.py rename to test/test_inference/namespace_package/ns2/pkg/ns2_folder/__init__.py diff --git a/test/test_evaluate/namespace_package/ns2/pkg/ns2_folder/nested/__init__.py b/test/test_inference/namespace_package/ns2/pkg/ns2_folder/nested/__init__.py similarity index 100% rename from test/test_evaluate/namespace_package/ns2/pkg/ns2_folder/nested/__init__.py rename to test/test_inference/namespace_package/ns2/pkg/ns2_folder/nested/__init__.py diff --git a/test/test_evaluate/nested_namespaces/__init__.py b/test/test_inference/nested_namespaces/__init__.py similarity index 100% rename from test/test_evaluate/nested_namespaces/__init__.py rename to test/test_inference/nested_namespaces/__init__.py diff --git a/test/test_evaluate/nested_namespaces/namespace/__init__.py b/test/test_inference/nested_namespaces/namespace/__init__.py similarity index 100% rename from test/test_evaluate/nested_namespaces/namespace/__init__.py rename to test/test_inference/nested_namespaces/namespace/__init__.py diff --git a/test/test_evaluate/nested_namespaces/namespace/pkg/__init__.py b/test/test_inference/nested_namespaces/namespace/pkg/__init__.py similarity index 100% rename from test/test_evaluate/nested_namespaces/namespace/pkg/__init__.py rename to test/test_inference/nested_namespaces/namespace/pkg/__init__.py diff --git a/test/test_evaluate/not_in_sys_path/__init__.py b/test/test_inference/not_in_sys_path/__init__.py similarity index 100% rename from test/test_evaluate/not_in_sys_path/__init__.py rename to test/test_inference/not_in_sys_path/__init__.py diff --git a/test/test_evaluate/not_in_sys_path/not_in_sys_path.py b/test/test_inference/not_in_sys_path/not_in_sys_path.py similarity index 100% rename from test/test_evaluate/not_in_sys_path/not_in_sys_path.py rename to test/test_inference/not_in_sys_path/not_in_sys_path.py diff --git a/test/test_evaluate/not_in_sys_path/not_in_sys_path_package/__init__.py b/test/test_inference/not_in_sys_path/not_in_sys_path_package/__init__.py similarity index 100% rename from test/test_evaluate/not_in_sys_path/not_in_sys_path_package/__init__.py rename to test/test_inference/not_in_sys_path/not_in_sys_path_package/__init__.py diff --git a/test/test_evaluate/not_in_sys_path/not_in_sys_path_package/module.py b/test/test_inference/not_in_sys_path/not_in_sys_path_package/module.py similarity index 100% rename from test/test_evaluate/not_in_sys_path/not_in_sys_path_package/module.py rename to test/test_inference/not_in_sys_path/not_in_sys_path_package/module.py diff --git a/test/test_evaluate/not_in_sys_path/pkg/__init__.py b/test/test_inference/not_in_sys_path/pkg/__init__.py similarity index 100% rename from test/test_evaluate/not_in_sys_path/pkg/__init__.py rename to test/test_inference/not_in_sys_path/pkg/__init__.py diff --git a/test/test_evaluate/not_in_sys_path/pkg/module.py b/test/test_inference/not_in_sys_path/pkg/module.py similarity index 100% rename from test/test_evaluate/not_in_sys_path/pkg/module.py rename to test/test_inference/not_in_sys_path/pkg/module.py diff --git a/test/test_evaluate/sample_venvs/pth_directory/dir-from-foo-pth/__init__.py b/test/test_inference/sample_venvs/pth_directory/dir-from-foo-pth/__init__.py similarity index 100% rename from test/test_evaluate/sample_venvs/pth_directory/dir-from-foo-pth/__init__.py rename to test/test_inference/sample_venvs/pth_directory/dir-from-foo-pth/__init__.py diff --git a/test/test_evaluate/sample_venvs/pth_directory/egg_link.egg-link b/test/test_inference/sample_venvs/pth_directory/egg_link.egg-link similarity index 100% rename from test/test_evaluate/sample_venvs/pth_directory/egg_link.egg-link rename to test/test_inference/sample_venvs/pth_directory/egg_link.egg-link diff --git a/test/test_evaluate/sample_venvs/pth_directory/foo.pth b/test/test_inference/sample_venvs/pth_directory/foo.pth similarity index 100% rename from test/test_evaluate/sample_venvs/pth_directory/foo.pth rename to test/test_inference/sample_venvs/pth_directory/foo.pth diff --git a/test/test_evaluate/sample_venvs/pth_directory/import_smth.pth b/test/test_inference/sample_venvs/pth_directory/import_smth.pth similarity index 100% rename from test/test_evaluate/sample_venvs/pth_directory/import_smth.pth rename to test/test_inference/sample_venvs/pth_directory/import_smth.pth diff --git a/test/test_evaluate/sample_venvs/pth_directory/relative.egg-link b/test/test_inference/sample_venvs/pth_directory/relative.egg-link similarity index 100% rename from test/test_evaluate/sample_venvs/pth_directory/relative.egg-link rename to test/test_inference/sample_venvs/pth_directory/relative.egg-link diff --git a/test/test_evaluate/sample_venvs/pth_directory/smth.py b/test/test_inference/sample_venvs/pth_directory/smth.py similarity index 100% rename from test/test_evaluate/sample_venvs/pth_directory/smth.py rename to test/test_inference/sample_venvs/pth_directory/smth.py diff --git a/test/test_evaluate/test_absolute_import.py b/test/test_inference/test_absolute_import.py similarity index 80% rename from test/test_evaluate/test_absolute_import.py rename to test/test_inference/test_absolute_import.py index bc2bdb07..1052aa5d 100644 --- a/test/test_evaluate/test_absolute_import.py +++ b/test/test_inference/test_absolute_import.py @@ -5,7 +5,7 @@ Python 2.X) from .. import helpers -@helpers.cwd_at("test/test_evaluate/absolute_import") +@helpers.cwd_at("test/test_inference/absolute_import") def test_can_complete_when_shadowing(Script): script = Script(path="unittest.py") assert script.completions() diff --git a/test/test_evaluate/test_annotations.py b/test/test_inference/test_annotations.py similarity index 100% rename from test/test_evaluate/test_annotations.py rename to test/test_inference/test_annotations.py diff --git a/test/test_evaluate/test_buildout_detection.py b/test/test_inference/test_buildout_detection.py similarity index 100% rename from test/test_evaluate/test_buildout_detection.py rename to test/test_inference/test_buildout_detection.py diff --git a/test/test_evaluate/test_compiled.py b/test/test_inference/test_compiled.py similarity index 98% rename from test/test_evaluate/test_compiled.py rename to test/test_inference/test_compiled.py index 0d4bb900..fdf349bf 100644 --- a/test/test_evaluate/test_compiled.py +++ b/test/test_inference/test_compiled.py @@ -119,7 +119,7 @@ def _return_int(): ('cos', 'cos', 'math'), ('dec', 'Decimal', 'decimal'), ('dt', 'datetime', 'datetime'), - ('ret_int', '_return_int', 'test.test_evaluate.test_compiled'), + ('ret_int', '_return_int', 'test.test_inference.test_compiled'), ] ) def test_parent_context(same_process_evaluator, attribute, expected_name, expected_parent): diff --git a/test/test_evaluate/test_context.py b/test/test_inference/test_context.py similarity index 100% rename from test/test_evaluate/test_context.py rename to test/test_inference/test_context.py diff --git a/test/test_evaluate/test_docstring.py b/test/test_inference/test_docstring.py similarity index 100% rename from test/test_evaluate/test_docstring.py rename to test/test_inference/test_docstring.py diff --git a/test/test_evaluate/test_extension.py b/test/test_inference/test_extension.py similarity index 98% rename from test/test_evaluate/test_extension.py rename to test/test_inference/test_extension.py index 7dfcfd0d..fb7801a3 100644 --- a/test/test_evaluate/test_extension.py +++ b/test/test_inference/test_extension.py @@ -35,7 +35,7 @@ def test_call_signatures_stdlib(Script): # Check only on linux 64 bit platform and Python3.4. @pytest.mark.skipif('sys.platform != "linux" or sys.maxsize <= 2**32 or sys.version_info[:2] != (3, 4)') -@cwd_at('test/test_evaluate') +@cwd_at('test/test_inference') def test_init_extension_module(Script): """ ``__init__`` extension modules are also packages and Jedi should understand diff --git a/test/test_evaluate/test_fstring.py b/test/test_inference/test_fstring.py similarity index 100% rename from test/test_evaluate/test_fstring.py rename to test/test_inference/test_fstring.py diff --git a/test/test_evaluate/test_gradual/test_stub_loading.py b/test/test_inference/test_gradual/test_stub_loading.py similarity index 100% rename from test/test_evaluate/test_gradual/test_stub_loading.py rename to test/test_inference/test_gradual/test_stub_loading.py diff --git a/test/test_evaluate/test_gradual/test_stubs.py b/test/test_inference/test_gradual/test_stubs.py similarity index 100% rename from test/test_evaluate/test_gradual/test_stubs.py rename to test/test_inference/test_gradual/test_stubs.py diff --git a/test/test_evaluate/test_gradual/test_typeshed.py b/test/test_inference/test_gradual/test_typeshed.py similarity index 100% rename from test/test_evaluate/test_gradual/test_typeshed.py rename to test/test_inference/test_gradual/test_typeshed.py diff --git a/test/test_evaluate/test_helpers.py b/test/test_inference/test_helpers.py similarity index 100% rename from test/test_evaluate/test_helpers.py rename to test/test_inference/test_helpers.py diff --git a/test/test_evaluate/test_implicit_namespace_package.py b/test/test_inference/test_implicit_namespace_package.py similarity index 100% rename from test/test_evaluate/test_implicit_namespace_package.py rename to test/test_inference/test_implicit_namespace_package.py diff --git a/test/test_evaluate/test_imports.py b/test/test_inference/test_imports.py similarity index 99% rename from test/test_evaluate/test_imports.py rename to test/test_inference/test_imports.py index 0edc3a8e..b0eef6d0 100644 --- a/test/test_evaluate/test_imports.py +++ b/test/test_inference/test_imports.py @@ -111,7 +111,7 @@ def test_find_module_not_package_zipped(Script, evaluator, environment): assert is_package is False -@cwd_at('test/test_evaluate/not_in_sys_path/pkg') +@cwd_at('test/test_inference/not_in_sys_path/pkg') def test_import_not_in_sys_path(Script): """ non-direct imports (not in sys.path) @@ -147,7 +147,7 @@ def test_flask_ext(Script, code, name): assert name in [c.name for c in completions] -@cwd_at('test/test_evaluate/') +@cwd_at('test/test_inference/') def test_not_importable_file(Script): src = 'import not_importable_file as x; x.' assert not Script(src, path='example.py').completions() diff --git a/test/test_evaluate/test_literals.py b/test/test_inference/test_literals.py similarity index 100% rename from test/test_evaluate/test_literals.py rename to test/test_inference/test_literals.py diff --git a/test/test_evaluate/test_mixed.py b/test/test_inference/test_mixed.py similarity index 100% rename from test/test_evaluate/test_mixed.py rename to test/test_inference/test_mixed.py diff --git a/test/test_evaluate/test_namespace_package.py b/test/test_inference/test_namespace_package.py similarity index 100% rename from test/test_evaluate/test_namespace_package.py rename to test/test_inference/test_namespace_package.py diff --git a/test/test_evaluate/test_precedence.py b/test/test_inference/test_precedence.py similarity index 100% rename from test/test_evaluate/test_precedence.py rename to test/test_inference/test_precedence.py diff --git a/test/test_evaluate/test_pyc.py b/test/test_inference/test_pyc.py similarity index 100% rename from test/test_evaluate/test_pyc.py rename to test/test_inference/test_pyc.py diff --git a/test/test_evaluate/test_representation.py b/test/test_inference/test_representation.py similarity index 100% rename from test/test_evaluate/test_representation.py rename to test/test_inference/test_representation.py diff --git a/test/test_evaluate/test_signature.py b/test/test_inference/test_signature.py similarity index 100% rename from test/test_evaluate/test_signature.py rename to test/test_inference/test_signature.py diff --git a/test/test_evaluate/test_stdlib.py b/test/test_inference/test_stdlib.py similarity index 100% rename from test/test_evaluate/test_stdlib.py rename to test/test_inference/test_stdlib.py diff --git a/test/test_evaluate/test_sys_path.py b/test/test_inference/test_sys_path.py similarity index 100% rename from test/test_evaluate/test_sys_path.py rename to test/test_inference/test_sys_path.py diff --git a/test/test_evaluate/zipped_imports/not_pkg.zip b/test/test_inference/zipped_imports/not_pkg.zip similarity index 100% rename from test/test_evaluate/zipped_imports/not_pkg.zip rename to test/test_inference/zipped_imports/not_pkg.zip diff --git a/test/test_evaluate/zipped_imports/pkg.zip b/test/test_inference/zipped_imports/pkg.zip similarity index 100% rename from test/test_evaluate/zipped_imports/pkg.zip rename to test/test_inference/zipped_imports/pkg.zip