Merge remote-tracking branch 'upstream/master'

1 files changed, 20 insertions, 11 deletions

diff --git a/test/command_callback/test_pylint_command_callback.vader b/test/command_callback/test_pylint_command_callback.vader
index 755dd292..15f004b6 100644
--- a/test/command_callback/test_pylint_command_callback.vader
+++ b/test/command_callback/test_pylint_command_callback.vader
@@ -8,6 +8,8 @@ Before:
   let b:bin_dir = has('win32') ? 'Scripts' : 'bin'
   let b:command_tail = ' --output-format text --msg-template="{path}:{line}:{column}: {msg_id} ({symbol}) {msg}" --reports n %s'
 
+  GivenCommandOutput ['pylint 2.3.0']
+
 After:
   unlet! b:bin_dir
   unlet! b:executable
@@ -17,26 +19,33 @@ After:
 
 Execute(The pylint callbacks should return the correct default values):
   AssertLinter 'pylint',
-  \ ale#path#CdString(expand('#' . bufnr('') . ':p:h'))
-  \   . ale#Escape('pylint') . ' ' . b:command_tail
+  \ ale#path#CdString(expand('%:p:h'))
+  \   . ale#Escape('pylint') . b:command_tail
+
+Execute(Pylint should run with the --from-stdin in new enough versions):
+  GivenCommandOutput ['pylint 2.4.0']
+
+  AssertLinter 'pylint',
+  \ ale#path#CdString(expand('%:p:h'))
+  \   . ale#Escape('pylint') . b:command_tail[:-3] . '--from-stdin %s'
 
 Execute(The option for disabling changing directories should work):
   let g:ale_python_pylint_change_directory = 0
 
-  AssertLinter 'pylint', ale#Escape('pylint') . ' ' . b:command_tail
+  AssertLinter 'pylint', ale#Escape('pylint') . b:command_tail
 
 Execute(The pylint executable should be configurable, and escaped properly):
   let g:ale_python_pylint_executable = 'executable with spaces'
 
   AssertLinter 'executable with spaces',
-  \ ale#path#CdString(expand('#' . bufnr('') . ':p:h'))
-  \   . ale#Escape('executable with spaces') . ' ' . b:command_tail
+  \ ale#path#CdString(expand('%:p:h'))
+  \   . ale#Escape('executable with spaces') . b:command_tail
 
 Execute(The pylint command callback should let you set options):
   let g:ale_python_pylint_options = '--some-option'
 
   AssertLinter 'pylint',
-  \ ale#path#CdString(expand('#' . bufnr('') . ':p:h'))
+  \ ale#path#CdString(expand('%:p:h'))
   \   . ale#Escape('pylint') . ' --some-option' . b:command_tail
 
 Execute(The pylint callbacks shouldn't detect virtualenv directories where they don't exist):
@@ -44,7 +53,7 @@ Execute(The pylint callbacks shouldn't detect virtualenv directories where they
 
   AssertLinter 'pylint',
   \ ale#path#CdString(ale#path#Simplify(g:dir . '/python_paths/no_virtualenv/subdir'))
-  \   . ale#Escape('pylint') . ' ' . b:command_tail
+  \   . ale#Escape('pylint') . b:command_tail
 
 Execute(The pylint callbacks should detect virtualenv directories):
   silent execute 'file ' . fnameescape(g:dir . '/python_paths/with_virtualenv/subdir/foo/bar.py')
@@ -55,7 +64,7 @@ Execute(The pylint callbacks should detect virtualenv directories):
 
   AssertLinter b:executable,
   \ ale#path#CdString(ale#path#Simplify(g:dir . '/python_paths/with_virtualenv/subdir'))
-  \   . ale#Escape(b:executable) . ' ' . b:command_tail
+  \   . ale#Escape(b:executable) . b:command_tail
 
 Execute(You should able able to use the global pylint instead):
   silent execute 'file ' . fnameescape(g:dir . '/python_paths/with_virtualenv/subdir/foo/bar.py')
@@ -63,7 +72,7 @@ Execute(You should able able to use the global pylint instead):
 
   AssertLinter 'pylint',
   \ ale#path#CdString(ale#path#Simplify(g:dir . '/python_paths/with_virtualenv/subdir'))
-  \   . ale#Escape('pylint') . ' ' . b:command_tail
+  \   . ale#Escape('pylint') . b:command_tail
 
 Execute(Setting executable to 'pipenv' appends 'run pylint'):
   let g:ale_python_pylint_executable = 'path/to/pipenv'
@@ -71,7 +80,7 @@ Execute(Setting executable to 'pipenv' appends 'run pylint'):
   AssertLinter 'path/to/pipenv',
   \ ale#path#CdString(expand('#' . bufnr('') . ':p:h'))
   \   . ale#Escape('path/to/pipenv') . ' run pylint'
-  \   . '  --output-format text --msg-template="{path}:{line}:{column}: {msg_id} ({symbol}) {msg}" --reports n %s'
+  \   . ' --output-format text --msg-template="{path}:{line}:{column}: {msg_id} ({symbol}) {msg}" --reports n %s'
 
 Execute(Pipenv is detected when python_pylint_auto_pipenv is set):
   let g:ale_python_pylint_auto_pipenv = 1
@@ -80,4 +89,4 @@ Execute(Pipenv is detected when python_pylint_auto_pipenv is set):
   AssertLinter 'pipenv',
   \ ale#path#CdString(expand('#' . bufnr('') . ':p:h'))
   \   . ale#Escape('pipenv') . ' run pylint'
-  \   . '  --output-format text --msg-template="{path}:{line}:{column}: {msg_id} ({symbol}) {msg}" --reports n %s'
+  \   . ' --output-format text --msg-template="{path}:{line}:{column}: {msg_id} ({symbol}) {msg}" --reports n %s'