thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.1.0316: swapinfo() test fails on Travis

Browse Source 
Problem:    swapinfo() test fails on Travis.
Solution:   Handle a long host name. (Ozaki Kiichi, closes #3361)
            Also make the version check flexible. (James McCoy)
This commit is contained in:
Bram Moolenaar
2018-08-22 11:28:01 +02:00
parent c631f2df62
commit 4c5765bc47
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/testdir/test_swap.vim
View File

@@ -105,9 +105,13 @@ func Test_swapinfo()
let fname = trim(execute('swapname')) let fname = trim(execute('swapname'))
call assert_match('Xswapinfo', fname) call assert_match('Xswapinfo', fname)
let info = swapinfo(fname) let info = swapinfo(fname)
call assert_match('8\.', info.version)
let ver = printf('VIM %d.%d', v:version / 100, v:version % 100)
call assert_equal(ver, info.version)
call assert_match('\w', info.user) call assert_match('\w', info.user)
call assert_equal(hostname(), info.host) " host name is truncated to 39 bytes in the swap file
call assert_equal(hostname()[:38], info.host)
call assert_match('Xswapinfo', info.fname) call assert_match('Xswapinfo', info.fname)
call assert_match(0, info.dirty) call assert_match(0, info.dirty)
call assert_equal(getpid(), info.pid) call assert_equal(getpid(), info.pid)

2
src/version.c
View File

@@ -794,6 +794,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
316,
/**/ /**/
315, 315,
/**/ /**/