Mercurial > vim
changeset 14605:0c47880f3d95 v8.1.0316
patch 8.1.0316: swapinfo() test fails on Travis
commit https://github.com/vim/vim/commit/4c5765bc47b2708075e8d8471e8d342079479777
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Aug 22 11:28:01 2018 +0200
patch 8.1.0316: swapinfo() test fails on Travis
Problem: swapinfo() test fails on Travis.
Solution: Handle a long host name. (Ozaki Kiichi, closes https://github.com/vim/vim/issues/3361)
Also make the version check flexible. (James McCoy)
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Wed, 22 Aug 2018 11:30:05 +0200 |
parents | b16163358e63 |
children | bde787e80383 |
files | src/testdir/test_swap.vim src/version.c |
diffstat | 2 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/test_swap.vim +++ b/src/testdir/test_swap.vim @@ -105,9 +105,13 @@ func Test_swapinfo() let fname = trim(execute('swapname')) call assert_match('Xswapinfo', 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_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(0, info.dirty) call assert_equal(getpid(), info.pid)