IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

test(old): fix mistakes in porting Vim patches 8.1.1362 and 8.1.1585 (#18080)

Browse Source
This commit is contained in:
zeertzjq 2022-04-12 04:56:15 +08:00 committed by GitHub
parent 85b33fc042
commit 10b40440dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
src/nvim/testdir/test_quickfix.vim
View File

@ -1038,21 +1038,20 @@ func s:dir_stack_tests(cchar)
let save_efm=&efm let save_efm=&efm
set efm=%DEntering\ dir\ '%f',%f:%l:%m,%XLeaving\ dir\ '%f' set efm=%DEntering\ dir\ '%f',%f:%l:%m,%XLeaving\ dir\ '%f'
let lines =<< trim [DATA] let lines = ["Entering dir 'dir1/a'",
Entering dir 'dir1/a' \ 'habits2.txt:1:Nine Healthy Habits',
habits2.txt:1:Nine Healthy Habits \ "Entering dir 'b'",
Entering dir 'b' \ 'habits3.txt:2:0 Hours of television',
habits3.txt:2:0 Hours of television \ 'habits2.txt:7:5 Small meals',
habits2.txt:7:5 Small meals \ "Entering dir 'dir1/c'",
Entering dir 'dir1/c' \ 'habits4.txt:3:1 Hour of exercise',
habits4.txt:3:1 Hour of exercise \ "Leaving dir 'dir1/c'",
Leaving dir 'dir1/c' \ "Leaving dir 'dir1/a'",
Leaving dir 'dir1/a' \ 'habits1.txt:4:2 Liters of water',
habits1.txt:4:2 Liters of water \ "Entering dir 'dir2'",
Entering dir 'dir2' \ 'habits5.txt:5:3 Cups of hot green tea',
habits5.txt:5:3 Cups of hot green tea \ "Leaving dir 'dir2'"
Leaving dir 'dir2 \]
[DATA]
Xexpr "" Xexpr ""
for l in lines for l in lines
@ -1086,19 +1085,18 @@ func Test_efm_dirstack()
call mkdir('dir1/c') call mkdir('dir1/c')
call mkdir('dir2') call mkdir('dir2')
let lines =<< trim [DATA] let lines = ["Nine Healthy Habits",
Nine Healthy Habits, \ "0 Hours of television",
0 Hours of television, \ "1 Hour of exercise",
1 Hour of exercise, \ "2 Liters of water",
2 Liters of water, \ "3 Cups of hot green tea",
3 Cups of hot green tea, \ "4 Short mental breaks",
4 Short mental breaks, \ "5 Small meals",
5 Small meals, \ "6 AM wake up time",
6 AM wake up time, \ "7 Minutes of laughter",
7 Minutes of laughter, \ "8 Hours of sleep (at least)",
8 Hours of sleep (at least), \ "9 PM end of the day and off to bed"
9 PM end of the day and off to bed \ ]
[DATA]
call writefile(lines, 'habits1.txt') call writefile(lines, 'habits1.txt')
call writefile(lines, 'dir1/a/habits2.txt') call writefile(lines, 'dir1/a/habits2.txt')
@ -1220,6 +1218,7 @@ func Test_efm2()
(67,3) warning: 's' already defined (67,3) warning: 's' already defined
-- --
[DATA] [DATA]
set efm=%+P[%f]%r,(%l\\,%c)%*[\ ]%t%*[^:]:\ %m,%+Q--%r set efm=%+P[%f]%r,(%l\\,%c)%*[\ ]%t%*[^:]:\ %m,%+Q--%r
" To exercise the push/pop file functionality in quickfix, the test files " To exercise the push/pop file functionality in quickfix, the test files
" need to be created. " need to be created.
@ -1280,20 +1279,21 @@ func Test_efm2()
" Test for %A, %C and other formats " Test for %A, %C and other formats
let lines =<< trim [DATA] let lines =<< trim [DATA]
============================================================== ==============================================================
FAIL: testGetTypeIdCachesResult (dbfacadeTest.DjsDBFacadeTest) FAIL: testGetTypeIdCachesResult (dbfacadeTest.DjsDBFacadeTest)
-------------------------------------------------------------- --------------------------------------------------------------
Traceback (most recent call last): Traceback (most recent call last):
File "unittests/dbfacadeTest.py", line 89, in testFoo File "unittests/dbfacadeTest.py", line 89, in testFoo
self.assertEquals(34, dtid) self.assertEquals(34, dtid)
File "/usr/lib/python2.2/unittest.py", line 286, in File "/usr/lib/python2.2/unittest.py", line 286, in
failUnlessEqual failUnlessEqual
raise self.failureException, \\ raise self.failureException, \\
W:AssertionError: 34 != 33 W:AssertionError: 34 != 33
-------------------------------------------------------------- --------------------------------------------------------------
Ran 27 tests in 0.063s Ran 27 tests in 0.063s
[DATA] [DATA]
set efm=%C\ %.%#,%A\ \ File\ \"%f\"\\,\ line\ %l%.%#,%Z%[%^\ ]%\\@=%t:%m set efm=%C\ %.%#,%A\ \ File\ \"%f\"\\,\ line\ %l%.%#,%Z%[%^\ ]%\\@=%t:%m
cgetexpr lines cgetexpr lines
let l = getqflist() let l = getqflist()