2 files changed, 57 insertions, 57 deletions
diff --git a/test/linter/test_pyls.vader b/test/linter/test_pyls.vader
deleted file mode 100644
index 74a86ccb..00000000
--- a/test/linter/test_pyls.vader
+++ /dev/null
@@ -1,57 +0,0 @@
-Before:
-  call ale#assert#SetUpLinterTest('python', 'pyls')
-
-  let b:bin_dir = has('win32') ? 'Scripts' : 'bin'
-
-After:
-  unlet! b:bin_dir
-  unlet! b:executable
-
-  call ale#assert#TearDownLinterTest()
-
-Execute(The pyls command callback should return default string):
-  AssertLinter 'pyls', ale#Escape('pyls')
-
-Execute(The pyls executable should be configurable):
-  let g:ale_python_pyls_executable = '~/.local/bin/pyls'
-
-  AssertLinter '~/.local/bin/pyls' , ale#Escape('~/.local/bin/pyls')
-
-Execute(The pyls command callback should let you set options):
-  let g:ale_python_pyls_options = '--some-option'
-
-  AssertLinter 'pyls', ale#Escape('pyls') . ' --some-option'
-
-Execute(The pyls executable should be run from the virtualenv path):
-  call ale#test#SetFilename('../test-files/python/with_virtualenv/subdir/foo/bar.py')
-
-  let b:executable = ale#path#Simplify(
-  \ g:dir . '/../test-files/python/with_virtualenv/env/' . b:bin_dir . '/pyls'
-  \)
-
-  AssertEqual ale#Escape(b:executable),
-  \ ale_linters#python#pyls#GetCommand(bufnr(''))
-
-Execute(You should be able to override the pyls virtualenv lookup):
-  call ale#test#SetFilename('../test-files/python/with_virtualenv/subdir/foo/bar.py')
-
-  let g:ale_python_pyls_use_global = 1
-
-  AssertLinter 'pyls', ale#Escape('pyls')
-
-Execute(Setting executable to 'pipenv' appends 'run pyls'):
-  let g:ale_python_pyls_executable = 'path/to/pipenv'
-
-  AssertLinter 'path/to/pipenv', ale#Escape('path/to/pipenv') . ' run pyls'
-
-Execute(Pipenv is detected when python_pyls_auto_pipenv is set):
-  let g:ale_python_pyls_auto_pipenv = 1
-  call ale#test#SetFilename('../test-files/python/pipenv/whatever.py')
-
-  AssertLinter 'pipenv',
-  \ ale#Escape('pipenv') . ' run pyls'
-
-Execute(Should accept configuration settings):
-  AssertLSPConfig {}
-  let b:ale_python_pyls_config = {'pyls': {'plugins': {'preload': {'enabled': v:false}}}}
-  AssertLSPConfig {'pyls': {'plugins': {'preload': {'enabled': v:false}}}}
diff --git a/test/linter/test_pylsp.vader b/test/linter/test_pylsp.vader
new file mode 100644
index 00000000..9d7d0775
--- /dev/null
+++ b/test/linter/test_pylsp.vader
@@ -0,0 +1,57 @@
+Before:
+  call ale#assert#SetUpLinterTest('python', 'pylsp')
+
+  let b:bin_dir = has('win32') ? 'Scripts' : 'bin'
+
+After:
+  unlet! b:bin_dir
+  unlet! b:executable
+
+  call ale#assert#TearDownLinterTest()
+
+Execute(The pylsp command callback should return default string):
+  AssertLinter 'pylsp', ale#Escape('pylsp')
+
+Execute(The pylsp executable should be configurable):
+  let g:ale_python_pylsp_executable = '~/.local/bin/pylsp'
+
+  AssertLinter '~/.local/bin/pylsp' , ale#Escape('~/.local/bin/pylsp')
+
+Execute(The pylsp command callback should let you set options):
+  let g:ale_python_pylsp_options = '--some-option'
+
+  AssertLinter 'pylsp', ale#Escape('pylsp') . ' --some-option'
+
+Execute(The pylsp executable should be run from the virtualenv path):
+  call ale#test#SetFilename('../test-files/python/with_virtualenv/subdir/foo/bar.py')
+
+  let b:executable = ale#path#Simplify(
+  \ g:dir . '/../test-files/python/with_virtualenv/env/' . b:bin_dir . '/pylsp'
+  \)
+
+  AssertEqual ale#Escape(b:executable),
+  \ ale_linters#python#pylsp#GetCommand(bufnr(''))
+
+Execute(You should be able to override the pylsp virtualenv lookup):
+  call ale#test#SetFilename('../test-files/python/with_virtualenv/subdir/foo/bar.py')
+
+  let g:ale_python_pylsp_use_global = 1
+
+  AssertLinter 'pylsp', ale#Escape('pylsp')
+
+Execute(Setting executable to 'pipenv' appends 'run pylsp'):
+  let g:ale_python_pylsp_executable = 'path/to/pipenv'
+
+  AssertLinter 'path/to/pipenv', ale#Escape('path/to/pipenv') . ' run pylsp'
+
+Execute(Pipenv is detected when python_pylsp_auto_pipenv is set):
+  let g:ale_python_pylsp_auto_pipenv = 1
+  call ale#test#SetFilename('../test-files/python/pipenv/whatever.py')
+
+  AssertLinter 'pipenv',
+  \ ale#Escape('pipenv') . ' run pylsp'
+
+Execute(Should accept configuration settings):
+  AssertLSPConfig {}
+  let b:ale_python_pylsp_config = {'pylsp': {'plugins': {'preload': {'enabled': v:false}}}}
+  AssertLSPConfig {'pylsp': {'plugins': {'preload': {'enabled': v:false}}}}