1 files changed, 6 insertions, 22 deletions
diff --git a/test/command_callback/test_pyls_command_callback.vader b/test/command_callback/test_pyls_command_callback.vader
index 4bef4742..53bf3000 100644
--- a/test/command_callback/test_pyls_command_callback.vader
+++ b/test/command_callback/test_pyls_command_callback.vader
@@ -1,34 +1,21 @@
 Before:
-  Save g:ale_python_pyls_executable
-  Save g:ale_python_pyls_use_global
-
-  unlet! g:ale_python_pyls_executable
-  unlet! g:ale_python_pyls_use_global
+  call ale#assert#SetUpLinterTest('python', 'pyls')
 
   let b:bin_dir = has('win32') ? 'Scripts' : 'bin'
 
-  call ale#test#SetDirectory('/testplugin/test/command_callback')
-
-  runtime ale_linters/python/pyls.vim
-
 After:
-  Restore
-
   unlet! b:bin_dir
   unlet! b:executable
 
-  call ale#test#RestoreDirectory()
-  call ale#linter#Reset()
+  call ale#assert#TearDownLinterTest()
 
 Execute(The pyls command callback should return default string):
-  AssertEqual ale#Escape('pyls'),
-  \ ale_linters#python#pyls#GetCommand(bufnr(''))
+  AssertLinter 'pyls', ale#Escape('pyls')
 
 Execute(The pyls executable should be configurable):
   let g:ale_python_pyls_executable = '~/.local/bin/pyls'
 
-  AssertEqual ale#Escape('~/.local/bin/pyls'),
-  \ ale_linters#python#pyls#GetCommand(bufnr(''))
+  AssertLinter '~/.local/bin/pyls' , ale#Escape('~/.local/bin/pyls')
 
 Execute(The pyls executable should be run from the virtualenv path):
   call ale#test#SetFilename('python_paths/with_virtualenv/subdir/foo/bar.py')
@@ -45,12 +32,9 @@ Execute(You should be able to override the pyls virtualenv lookup):
 
   let g:ale_python_pyls_use_global = 1
 
-  AssertEqual ale#Escape('pyls'),
-  \ ale_linters#python#pyls#GetCommand(bufnr(''))
+  AssertLinter 'pyls', ale#Escape('pyls')
 
 Execute(Setting executable to 'pipenv' appends 'run pyls'):
   let g:ale_python_pyls_executable = 'path/to/pipenv'
 
-  AssertEqual
-  \ ale#Escape('path/to/pipenv') . ' run pyls',
-  \ ale_linters#python#pyls#GetCommand(bufnr(''))
+  AssertLinter 'path/to/pipenv', ale#Escape('path/to/pipenv') . ' run pyls'