diff options
author | w0rp <devw0rp@gmail.com> | 2017-12-19 18:23:09 +0000 |
---|---|---|
committer | w0rp <devw0rp@gmail.com> | 2017-12-19 18:23:09 +0000 |
commit | 1568bf81281507aaaa8c71af85e244e94bd2924c (patch) | |
tree | 4694f6d24b82b6b57a7b934aebe68ea1c09ec57b /test/command_callback/test_mypy_command_callback.vader | |
parent | 73f61514c9039e7e863da3544f251d3f8d7d1956 (diff) | |
download | ale-1568bf81281507aaaa8c71af85e244e94bd2924c.zip |
Fix the mscs tests on Windows, and use the improved Simplify for all tests instead.v1.7.0
Diffstat (limited to 'test/command_callback/test_mypy_command_callback.vader')
-rw-r--r-- | test/command_callback/test_mypy_command_callback.vader | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/command_callback/test_mypy_command_callback.vader b/test/command_callback/test_mypy_command_callback.vader index 4ccc008e..6a0add52 100644 --- a/test/command_callback/test_mypy_command_callback.vader +++ b/test/command_callback/test_mypy_command_callback.vader @@ -61,7 +61,7 @@ Execute(The mypy command should switch directories to the detected project root) \ 'mypy', \ ale_linters#python#mypy#GetExecutable(bufnr('')) AssertEqual - \ 'cd ' . ale#Escape(ale#path#Winify(g:dir . '/python_paths/no_virtualenv/subdir')) + \ 'cd ' . ale#Escape(ale#path#Simplify(g:dir . '/python_paths/no_virtualenv/subdir')) \ . ' && ' . ale#Escape('mypy') \ . ' --show-column-numbers ' \ . '--shadow-file %s %t %s', @@ -70,13 +70,13 @@ Execute(The mypy command should switch directories to the detected project root) Execute(The mypy callbacks should detect virtualenv directories and switch to the project root): silent execute 'file ' . fnameescape(g:dir . '/python_paths/with_virtualenv/subdir/foo/bar.py') - let b:executable = ale#path#Winify(g:dir . '/python_paths/with_virtualenv/env/' . b:bin_dir . '/mypy') + let b:executable = ale#path#Simplify(g:dir . '/python_paths/with_virtualenv/env/' . b:bin_dir . '/mypy') AssertEqual \ b:executable, \ ale_linters#python#mypy#GetExecutable(bufnr('')) AssertEqual - \ 'cd ' . ale#Escape(ale#path#Winify(g:dir . '/python_paths/with_virtualenv/subdir')) + \ 'cd ' . ale#Escape(ale#path#Simplify(g:dir . '/python_paths/with_virtualenv/subdir')) \ . ' && ' . ale#Escape(b:executable) \ . ' --show-column-numbers ' \ . '--shadow-file %s %t %s', @@ -90,7 +90,7 @@ Execute(You should able able to use the global mypy instead): \ 'mypy', \ ale_linters#python#mypy#GetExecutable(bufnr('')) AssertEqual - \ 'cd ' . ale#Escape(ale#path#Winify(g:dir . '/python_paths/with_virtualenv/subdir')) + \ 'cd ' . ale#Escape(ale#path#Simplify(g:dir . '/python_paths/with_virtualenv/subdir')) \ . ' && ' . ale#Escape('mypy') \ . ' --show-column-numbers ' \ . '--shadow-file %s %t %s', |