Move implicit namespace package code to example dir

This commit is contained in:
Dave Halter
2020-01-11 22:25:12 +01:00
parent 8459b02a98
commit f31c90926e
5 changed files with 16 additions and 13 deletions

View File

@@ -19,6 +19,7 @@ from functools import partial, wraps
test_dir = dirname(abspath(__file__)) test_dir = dirname(abspath(__file__))
root_dir = dirname(test_dir) root_dir = dirname(test_dir)
example_dir = join(test_dir, 'examples')
sample_int = 1 # This is used in completion/imports.py sample_int = 1 # This is used in completion/imports.py
@@ -28,8 +29,8 @@ skip_if_not_windows = partial(pytest.param,
marks=pytest.mark.skipif("sys.platform!='win32'")) marks=pytest.mark.skipif("sys.platform!='win32'"))
def get_example_dir(name): def get_example_dir(*names):
return join(test_dir, 'examples', name) return join(example_dir, *names)
def cwd_at(path): def cwd_at(path):

View File

@@ -1,7 +1,9 @@
from os.path import dirname, join from os.path import dirname
import pytest import pytest
from test.helpers import get_example_dir, example_dir
@pytest.fixture(autouse=True) @pytest.fixture(autouse=True)
def skip_not_supported_versions(environment): def skip_not_supported_versions(environment):
@@ -10,8 +12,8 @@ def skip_not_supported_versions(environment):
def test_implicit_namespace_package(Script): def test_implicit_namespace_package(Script):
sys_path = [join(dirname(__file__), d) sys_path = [get_example_dir('implicit_namespace_package', 'ns1'),
for d in ['implicit_namespace_package/ns1', 'implicit_namespace_package/ns2']] get_example_dir('implicit_namespace_package', 'ns2')]
def script_with_path(*args, **kwargs): def script_with_path(*args, **kwargs):
return Script(sys_path=sys_path, *args, **kwargs) return Script(sys_path=sys_path, *args, **kwargs)
@@ -53,7 +55,7 @@ def test_implicit_namespace_package(Script):
def test_implicit_nested_namespace_package(Script): def test_implicit_nested_namespace_package(Script):
code = 'from implicit_nested_namespaces.namespace.pkg.module import CONST' code = 'from implicit_nested_namespaces.namespace.pkg.module import CONST'
sys_path = [dirname(__file__)] sys_path = [example_dir]
script = Script(sys_path=sys_path, source=code, line=1, column=61) script = Script(sys_path=sys_path, source=code, line=1, column=61)
@@ -69,7 +71,7 @@ def test_implicit_nested_namespace_package(Script):
def test_implicit_namespace_package_import_autocomplete(Script): def test_implicit_namespace_package_import_autocomplete(Script):
CODE = 'from implicit_name' CODE = 'from implicit_name'
sys_path = [dirname(__file__)] sys_path = [example_dir]
script = Script(sys_path=sys_path, source=CODE) script = Script(sys_path=sys_path, source=CODE)
compl = script.complete() compl = script.complete()
@@ -78,8 +80,8 @@ def test_implicit_namespace_package_import_autocomplete(Script):
def test_namespace_package_in_multiple_directories_autocompletion(Script): def test_namespace_package_in_multiple_directories_autocompletion(Script):
CODE = 'from pkg.' CODE = 'from pkg.'
sys_path = [join(dirname(__file__), d) sys_path = [get_example_dir('implicit_namespace_package', 'ns1'),
for d in ['implicit_namespace_package/ns1', 'implicit_namespace_package/ns2']] get_example_dir('implicit_namespace_package', 'ns2')]
script = Script(sys_path=sys_path, source=CODE) script = Script(sys_path=sys_path, source=CODE)
compl = script.complete() compl = script.complete()
@@ -88,8 +90,8 @@ def test_namespace_package_in_multiple_directories_autocompletion(Script):
def test_namespace_package_in_multiple_directories_goto_definition(Script): def test_namespace_package_in_multiple_directories_goto_definition(Script):
CODE = 'from pkg import ns1_file' CODE = 'from pkg import ns1_file'
sys_path = [join(dirname(__file__), d) sys_path = [get_example_dir('implicit_namespace_package', 'ns1'),
for d in ['implicit_namespace_package/ns1', 'implicit_namespace_package/ns2']] get_example_dir('implicit_namespace_package', 'ns2')]
script = Script(sys_path=sys_path, source=CODE) script = Script(sys_path=sys_path, source=CODE)
result = script.infer() result = script.infer()
assert len(result) == 1 assert len(result) == 1
@@ -97,8 +99,8 @@ def test_namespace_package_in_multiple_directories_goto_definition(Script):
def test_namespace_name_autocompletion_full_name(Script): def test_namespace_name_autocompletion_full_name(Script):
CODE = 'from pk' CODE = 'from pk'
sys_path = [join(dirname(__file__), d) sys_path = [get_example_dir('implicit_namespace_package', 'ns1'),
for d in ['implicit_namespace_package/ns1', 'implicit_namespace_package/ns2']] get_example_dir('implicit_namespace_package', 'ns2')]
script = Script(sys_path=sys_path, source=CODE) script = Script(sys_path=sys_path, source=CODE)
compl = script.complete() compl = script.complete()