Some Windows compatibility fixes

This commit is contained in:
Dave Halter
2020-12-26 11:52:47 +01:00
parent 7298350e76
commit 86d57edda4
2 changed files with 5 additions and 3 deletions

View File

@@ -169,7 +169,8 @@ def test_reference_description(Script):
def test_get_line_code(Script): def test_get_line_code(Script):
def get_line_code(source, line=None, **kwargs): def get_line_code(source, line=None, **kwargs):
return Script(source).complete(line=line)[0].get_line_code(**kwargs) # On Windows replace \r
return Script(source).complete(line=line)[0].get_line_code(**kwargs).replace('\r', '')
# On builtin # On builtin
assert get_line_code('abs') == 'def abs(__n: SupportsAbs[_T]) -> _T: ...\n' assert get_line_code('abs') == 'def abs(__n: SupportsAbs[_T]) -> _T: ...\n'

View File

@@ -69,11 +69,12 @@ def test_stub_get_line_code(Script):
code = 'from abc import ABC; ABC' code = 'from abc import ABC; ABC'
script = Script(code) script = Script(code)
d, = script.goto(only_stubs=True) d, = script.goto(only_stubs=True)
assert d.get_line_code() == 'class ABC(metaclass=ABCMeta): ...\n' # Replace \r for tests on Windows
assert d.get_line_code().replace('\r', '') == 'class ABC(metaclass=ABCMeta): ...\n'
del parser_cache[script._inference_state.latest_grammar._hashed][d.module_path] del parser_cache[script._inference_state.latest_grammar._hashed][d.module_path]
d, = Script(path=d.module_path).goto(d.line, d.column, only_stubs=True) d, = Script(path=d.module_path).goto(d.line, d.column, only_stubs=True)
assert d.is_stub() assert d.is_stub()
assert d.get_line_code() == 'class ABC(metaclass=ABCMeta): ...\n' assert d.get_line_code().replace('\r', '') == 'class ABC(metaclass=ABCMeta): ...\n'
def test_os_stat_result(Script): def test_os_stat_result(Script):