From 796a2b4df55ddf5088de91d29c034f8fa9094c8d Mon Sep 17 00:00:00 2001 From: Dave Halter Date: Sun, 12 Jan 2020 00:51:27 +0100 Subject: [PATCH] Move namespace tests to examples --- pytest.ini | 2 +- .../namespace_package/ns1/pkg/__init__.py | 0 .../namespace_package/ns1/pkg/ns1_file.py | 0 .../namespace_package/ns1/pkg/ns1_folder/__init__.py | 0 .../namespace_package/ns2/pkg/ns2_file.py | 0 .../namespace_package/ns2/pkg/ns2_folder/__init__.py | 0 .../ns2/pkg/ns2_folder/nested/__init__.py | 0 .../nested_namespaces/__init__.py | 0 .../nested_namespaces/namespace/__init__.py | 0 .../nested_namespaces/namespace/pkg/__init__.py | 0 test/test_inference/test_namespace_package.py | 10 +++++----- 11 files changed, 6 insertions(+), 6 deletions(-) rename test/{test_inference => examples}/namespace_package/ns1/pkg/__init__.py (100%) rename test/{test_inference => examples}/namespace_package/ns1/pkg/ns1_file.py (100%) rename test/{test_inference => examples}/namespace_package/ns1/pkg/ns1_folder/__init__.py (100%) rename test/{test_inference => examples}/namespace_package/ns2/pkg/ns2_file.py (100%) rename test/{test_inference => examples}/namespace_package/ns2/pkg/ns2_folder/__init__.py (100%) rename test/{test_inference => examples}/namespace_package/ns2/pkg/ns2_folder/nested/__init__.py (100%) rename test/{test_inference => examples}/nested_namespaces/__init__.py (100%) rename test/{test_inference => examples}/nested_namespaces/namespace/__init__.py (100%) rename test/{test_inference => examples}/nested_namespaces/namespace/pkg/__init__.py (100%) diff --git a/pytest.ini b/pytest.ini index 40a8d853..16b886fa 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 namespace_package +norecursedirs = .* docs completion refactor scripts extensions speed static_analysis not_in_sys_path jedi/third_party diff --git a/test/test_inference/namespace_package/ns1/pkg/__init__.py b/test/examples/namespace_package/ns1/pkg/__init__.py similarity index 100% rename from test/test_inference/namespace_package/ns1/pkg/__init__.py rename to test/examples/namespace_package/ns1/pkg/__init__.py diff --git a/test/test_inference/namespace_package/ns1/pkg/ns1_file.py b/test/examples/namespace_package/ns1/pkg/ns1_file.py similarity index 100% rename from test/test_inference/namespace_package/ns1/pkg/ns1_file.py rename to test/examples/namespace_package/ns1/pkg/ns1_file.py diff --git a/test/test_inference/namespace_package/ns1/pkg/ns1_folder/__init__.py b/test/examples/namespace_package/ns1/pkg/ns1_folder/__init__.py similarity index 100% rename from test/test_inference/namespace_package/ns1/pkg/ns1_folder/__init__.py rename to test/examples/namespace_package/ns1/pkg/ns1_folder/__init__.py diff --git a/test/test_inference/namespace_package/ns2/pkg/ns2_file.py b/test/examples/namespace_package/ns2/pkg/ns2_file.py similarity index 100% rename from test/test_inference/namespace_package/ns2/pkg/ns2_file.py rename to test/examples/namespace_package/ns2/pkg/ns2_file.py diff --git a/test/test_inference/namespace_package/ns2/pkg/ns2_folder/__init__.py b/test/examples/namespace_package/ns2/pkg/ns2_folder/__init__.py similarity index 100% rename from test/test_inference/namespace_package/ns2/pkg/ns2_folder/__init__.py rename to test/examples/namespace_package/ns2/pkg/ns2_folder/__init__.py diff --git a/test/test_inference/namespace_package/ns2/pkg/ns2_folder/nested/__init__.py b/test/examples/namespace_package/ns2/pkg/ns2_folder/nested/__init__.py similarity index 100% rename from test/test_inference/namespace_package/ns2/pkg/ns2_folder/nested/__init__.py rename to test/examples/namespace_package/ns2/pkg/ns2_folder/nested/__init__.py diff --git a/test/test_inference/nested_namespaces/__init__.py b/test/examples/nested_namespaces/__init__.py similarity index 100% rename from test/test_inference/nested_namespaces/__init__.py rename to test/examples/nested_namespaces/__init__.py diff --git a/test/test_inference/nested_namespaces/namespace/__init__.py b/test/examples/nested_namespaces/namespace/__init__.py similarity index 100% rename from test/test_inference/nested_namespaces/namespace/__init__.py rename to test/examples/nested_namespaces/namespace/__init__.py diff --git a/test/test_inference/nested_namespaces/namespace/pkg/__init__.py b/test/examples/nested_namespaces/namespace/pkg/__init__.py similarity index 100% rename from test/test_inference/nested_namespaces/namespace/pkg/__init__.py rename to test/examples/nested_namespaces/namespace/pkg/__init__.py diff --git a/test/test_inference/test_namespace_package.py b/test/test_inference/test_namespace_package.py index 240c76b6..f6b34151 100644 --- a/test/test_inference/test_namespace_package.py +++ b/test/test_inference/test_namespace_package.py @@ -1,13 +1,13 @@ -from os.path import dirname, join +from os.path import join import pytest import py -from ..helpers import get_example_dir +from ..helpers import get_example_dir, example_dir -SYS_PATH = [join(dirname(__file__), d) - for d in ['namespace_package/ns1', 'namespace_package/ns2']] +SYS_PATH = [get_example_dir('namespace_package', 'ns1'), + get_example_dir('namespace_package', 'ns2')] def script_with_path(Script, *args, **kwargs): @@ -68,7 +68,7 @@ def test_completions(Script, source, solution): def test_nested_namespace_package(Script): code = 'from nested_namespaces.namespace.pkg import CONST' - sys_path = [dirname(__file__)] + sys_path = [example_dir] script = Script(sys_path=sys_path, source=code)