From d4583f1a63ca02a36eea5437fc3674b572213cbd Mon Sep 17 00:00:00 2001 From: w0rp Date: Sun, 23 Aug 2020 20:14:08 +0100 Subject: [PATCH] Try to fix Windows tests again --- test/fix/test_ale_fix.vader | 5 +++++ test/test_loclist_corrections.vader | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/test/fix/test_ale_fix.vader b/test/fix/test_ale_fix.vader index 22a555a8..7fe5c61c 100644 --- a/test/fix/test_ale_fix.vader +++ b/test/fix/test_ale_fix.vader @@ -230,6 +230,11 @@ Execute(Should apply filename mpapings): ALEFix call ale#test#FlushJobs() + if has('win32') + " We have to correct the output on Windows. + call setline(1, substitute(getline(1), '\r', '', '')) + endif + Expect(The mapped filename should be printed): /some/fake/path/test.txt diff --git a/test/test_loclist_corrections.vader b/test/test_loclist_corrections.vader index 2dde9c63..d53b1411 100644 --- a/test/test_loclist_corrections.vader +++ b/test/test_loclist_corrections.vader @@ -13,13 +13,13 @@ After: Execute(FixLocList should map filenames): " Paths converted back into temporary filenames shouldn't be included. let g:ale_filename_mappings = { - \ 'linter2': [['/xxx', '/data']], + \ 'linter2': [['/xxx/', '/data/']], \ 'linter1': [ - \ ['/bar', '/data/special'], - \ ['/foo', '/data'], + \ ['/bar/', '/data/special/'], + \ ['/foo/', '/data/'], \ [ - \ ale#path#Simplify(fnamemodify(ale#util#Tempname(), ':h:h')), - \ '/x-tmp', + \ ale#path#Simplify(fnamemodify(ale#util#Tempname(), ':h:h')) . '/', + \ '/x-tmp/', \ ], \ ], \}