summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorw0rp <devw0rp@gmail.com>2017-10-01 18:47:54 +0100
committerw0rp <devw0rp@gmail.com>2017-10-01 18:47:54 +0100
commit638ca4208232ab7abe46efa5052403e58dcfc35a (patch)
treef64eec30956a9813ba10a829c55c9d65ec1da9d1 /test
parent4634b1be93adbeb1cbed2b9f25025b45d0c5015b (diff)
downloadale-638ca4208232ab7abe46efa5052403e58dcfc35a.zip
Use local versions of yapf on Windows, and get the callback tests to pass
Diffstat (limited to 'test')
-rw-r--r--test/fixers/test_yapf_fixer_callback.vader10
1 files changed, 7 insertions, 3 deletions
diff --git a/test/fixers/test_yapf_fixer_callback.vader b/test/fixers/test_yapf_fixer_callback.vader
index 6edc2678..e6075568 100644
--- a/test/fixers/test_yapf_fixer_callback.vader
+++ b/test/fixers/test_yapf_fixer_callback.vader
@@ -9,9 +9,13 @@ Before:
silent cd command_callback
let g:dir = getcwd()
+ let b:bin_dir = has('win32') ? 'Scripts' : 'bin'
+
After:
Restore
+ unlet! b:bin_dir
+
call ale#test#RestoreDirectory()
Execute(The yapf callback should return the correct default values):
@@ -22,7 +26,7 @@ Execute(The yapf callback should return the correct default values):
call ale#test#SetFilename('python_paths/with_virtualenv/subdir/foo/bar.py')
AssertEqual
- \ {'command': ale#Escape(g:dir . '/python_paths/with_virtualenv/env/bin/yapf')},
+ \ {'command': ale#Escape(ale#path#Winify(g:dir . '/python_paths/with_virtualenv/env/' . b:bin_dir . '/yapf'))},
\ ale#fixers#yapf#Fix(bufnr(''))
\
Execute(The yapf should include the .style.yapf file if present):
@@ -31,8 +35,8 @@ Execute(The yapf should include the .style.yapf file if present):
AssertEqual
\ {
\ 'command':
- \ ale#Escape(g:dir . '/python_paths/with_virtualenv/env/bin/yapf')
+ \ ale#Escape(ale#path#Winify(g:dir . '/python_paths/with_virtualenv/env/' . b:bin_dir . '/yapf'))
\ . ' --no-local-style'
- \ . ' --style ' . ale#Escape(g:dir . '/python_paths/with_virtualenv/dir_with_yapf_config/.style.yapf'),
+ \ . ' --style ' . ale#Escape(ale#path#Winify(g:dir . '/python_paths/with_virtualenv/dir_with_yapf_config/.style.yapf')),
\ },
\ ale#fixers#yapf#Fix(bufnr(''))