mirror of
https://github.com/davidhalter/jedi.git
synced 2025-12-06 14:04:26 +08:00
Make Django test optional
This commit is contained in:
@@ -147,6 +147,12 @@ def has_typing(environment):
|
|||||||
return bool(script.infer())
|
return bool(script.infer())
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.fixture(scope='session')
|
||||||
|
def has_django(environment):
|
||||||
|
script = jedi.Script('import django', environment=environment)
|
||||||
|
return bool(script.infer())
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture(scope='session')
|
@pytest.fixture(scope='session')
|
||||||
def jedi_path():
|
def jedi_path():
|
||||||
return os.path.dirname(__file__)
|
return os.path.dirname(__file__)
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ unspecified = %s
|
|||||||
""" % (case, sorted(d - a), sorted(a - d))
|
""" % (case, sorted(d - a), sorted(a - d))
|
||||||
|
|
||||||
|
|
||||||
def test_completion(case, monkeypatch, environment, has_typing):
|
def test_completion(case, monkeypatch, environment, has_typing, has_django):
|
||||||
skip_reason = case.get_skip_reason(environment)
|
skip_reason = case.get_skip_reason(environment)
|
||||||
if skip_reason is not None:
|
if skip_reason is not None:
|
||||||
pytest.skip(skip_reason)
|
pytest.skip(skip_reason)
|
||||||
@@ -47,6 +47,8 @@ def test_completion(case, monkeypatch, environment, has_typing):
|
|||||||
_CONTAINS_TYPING = ('pep0484_typing', 'pep0484_comments', 'pep0526_variables')
|
_CONTAINS_TYPING = ('pep0484_typing', 'pep0484_comments', 'pep0526_variables')
|
||||||
if not has_typing and any(x in case.path for x in _CONTAINS_TYPING):
|
if not has_typing and any(x in case.path for x in _CONTAINS_TYPING):
|
||||||
pytest.skip('Needs the typing module installed to run this test.')
|
pytest.skip('Needs the typing module installed to run this test.')
|
||||||
|
if not has_django and case.path.endswith('django.py'):
|
||||||
|
pytest.skip('Needs django to be installed to run this test.')
|
||||||
repo_root = helpers.root_dir
|
repo_root = helpers.root_dir
|
||||||
monkeypatch.chdir(os.path.join(repo_root, 'jedi'))
|
monkeypatch.chdir(os.path.join(repo_root, 'jedi'))
|
||||||
case.run(assert_case_equal, environment)
|
case.run(assert_case_equal, environment)
|
||||||
|
|||||||
Reference in New Issue
Block a user