vim-patch:8.0.0292 (#7592)

Problem:    The stat test is a bit slow.
Solution:   Remove a couple of sleep comments and reduce another.

a2f28859bf
This commit is contained in:
KunMing Xie
2017-11-22 18:57:56 +08:00
committed by Justin M. Keyes
parent 7b686881a1
commit bb7795e820
2 changed files with 22 additions and 15 deletions

View File

@@ -1,24 +1,24 @@
" Tests for stat functions and checktime " Tests for stat functions and checktime
func Test_existent_file() func Test_existent_file()
let fname='Xtest.tmp' let fname = 'Xtest.tmp'
let ts=localtime() let ts = localtime()
sleep 1 let fl = ['Hello World!']
let fl=['Hello World!']
call writefile(fl, fname) call writefile(fl, fname)
let tf=getftime(fname) let tf = getftime(fname)
sleep 1 let te = localtime()
let te=localtime()
call assert_true(ts <= tf && tf <= te) call assert_true(ts <= tf && tf <= te)
call assert_equal(strlen(fl[0] . "\n"), getfsize(fname)) call assert_equal(strlen(fl[0] . "\n"), getfsize(fname))
call assert_equal('file', getftype(fname)) call assert_equal('file', getftype(fname))
call assert_equal('rw-', getfperm(fname)[0:2]) call assert_equal('rw-', getfperm(fname)[0:2])
call delete(fname)
endfunc endfunc
func Test_existent_directory() func Test_existent_directory()
let dname='.' let dname = '.'
call assert_equal(0, getfsize(dname)) call assert_equal(0, getfsize(dname))
call assert_equal('dir', getftype(dname)) call assert_equal('dir', getftype(dname))
@@ -26,22 +26,29 @@ func Test_existent_directory()
endfunc endfunc
func Test_checktime() func Test_checktime()
let fname='Xtest.tmp' let fname = 'Xtest.tmp'
let fl=['Hello World!'] let fl = ['Hello World!']
call writefile(fl, fname) call writefile(fl, fname)
set autoread set autoread
exec 'e' fname exec 'e' fname
" FAT has a granularity of 2 seconds, otherwise it's usually 1 second
if has('win32')
sleep 2 sleep 2
let fl=readfile(fname) else
sleep 2
endif
let fl = readfile(fname)
let fl[0] .= ' - checktime' let fl[0] .= ' - checktime'
call writefile(fl, fname) call writefile(fl, fname)
checktime checktime
call assert_equal(fl[0], getline(1)) call assert_equal(fl[0], getline(1))
call delete(fname)
endfunc endfunc
func Test_nonexistent_file() func Test_nonexistent_file()
let fname='Xtest.tmp' let fname = 'Xtest.tmp'
call delete(fname) call delete(fname)
call assert_equal(-1, getftime(fname)) call assert_equal(-1, getftime(fname))
@@ -55,7 +62,7 @@ func Test_win32_symlink_dir()
" So we use an existing symlink for this test. " So we use an existing symlink for this test.
if has('win32') if has('win32')
" Check if 'C:\Users\All Users' is a symlink to a directory. " Check if 'C:\Users\All Users' is a symlink to a directory.
let res=system('dir C:\Users /a') let res = system('dir C:\Users /a')
if match(res, '\C<SYMLINKD> *All Users') >= 0 if match(res, '\C<SYMLINKD> *All Users') >= 0
" Get the filetype of the symlink. " Get the filetype of the symlink.
call assert_equal('dir', getftype('C:\Users\All Users')) call assert_equal('dir', getftype('C:\Users\All Users'))

View File

@@ -812,7 +812,7 @@ static const int included_patches[] = {
// 295, // 295,
294, 294,
// 293, // 293,
// 292, 292,
291, 291,
290, 290,
// 289, // 289,