summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorw0rp <devw0rp@gmail.com>2020-08-23 20:14:08 +0100
committerw0rp <devw0rp@gmail.com>2020-08-23 20:14:08 +0100
commitd4583f1a63ca02a36eea5437fc3674b572213cbd (patch)
treede7ef8eaa3c6454e2dd0510921e54883237511b7 /test
parentc0566db1d2f9850937b498c134d6297896cd2a6f (diff)
downloadale-d4583f1a63ca02a36eea5437fc3674b572213cbd.zip
Try to fix Windows tests again
Diffstat (limited to 'test')
-rw-r--r--test/fix/test_ale_fix.vader5
-rw-r--r--test/test_loclist_corrections.vader10
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/',
\ ],
\ ],
\}