Change the last few tests to remove jedi completely and now tox -e py35 passes.

This commit is contained in:
Dave Halter
2017-05-15 15:19:14 -04:00
parent 0e99c4912f
commit a1675dfe2e
2 changed files with 5 additions and 12 deletions

View File

@@ -48,7 +48,7 @@ def pytest_unconfigure(config):
@pytest.fixture(scope='session')
def clean_parso_cache(request):
"""
Set `jedi.settings.cache_directory` to a temporary directory during test.
Set the default cache directory to a temporary directory during tests.
Note that you can't use built-in `tmpdir` and `monkeypatch`
fixture here because their scope is 'function', which is not used
@@ -56,12 +56,11 @@ def clean_parso_cache(request):
This fixture is activated in ../pytest.ini.
"""
from jedi import settings
old = settings.cache_directory
tmp = tempfile.mkdtemp(prefix='jedi-test-')
settings.cache_directory = tmp
old = cache._default_cache_path
tmp = tempfile.mkdtemp(prefix='parso-test-')
cache.default_cache_path = tmp
@request.addfinalizer
def restore():
settings.cache_directory = old
cache._default_cache_path = old
shutil.rmtree(tmp)

View File

@@ -144,12 +144,6 @@ class TokenTest(unittest.TestCase):
assert string_tok.value == s
def test_tokenizer_with_string_literal_backslash():
import jedi
c = jedi.Script("statement = u'foo\\\n'; statement").goto_definitions()
assert c[0]._name._context.obj == 'foo'
def test_ur_literals():
"""
Decided to parse `u''` literals regardless of Python version. This makes