diff options
| author | James McCoy <jamessan@jamessan.com> | 2018-11-18 12:05:43 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2018-11-18 18:05:43 +0100 |
| commit | 344dd2757ac24417252ac4d5c73382eb07f81ede (patch) | |
| tree | f15f8f81cc3956e3fa3faa4c7cc1770eba493b40 | |
| parent | 180b50dddc26d18ccedd0dfae39e3dfe8b71a338 (diff) | |
| download | rneovim-344dd2757ac24417252ac4d5c73382eb07f81ede.tar.gz rneovim-344dd2757ac24417252ac4d5c73382eb07f81ede.tar.bz2 rneovim-344dd2757ac24417252ac4d5c73382eb07f81ede.zip | |
vim-patch:8.1.0536: file time test fails when using NFS (#9251)
Problem: File time test fails when using NFS.
Solution: Use three file times instead of localtim(). (James McCoy,
closes vim/vim#3618)
https://github.com/vim/vim/commit/addc156c38d442367854f71baee31f2eb003c699
| -rw-r--r-- | src/nvim/testdir/test_stat.vim | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/src/nvim/testdir/test_stat.vim b/src/nvim/testdir/test_stat.vim index 74b76d668e..253f74c2ad 100644 --- a/src/nvim/testdir/test_stat.vim +++ b/src/nvim/testdir/test_stat.vim @@ -1,31 +1,33 @@ " Tests for stat functions and checktime func CheckFileTime(doSleep) - let fname = 'Xtest.tmp' + let fnames = ['Xtest1.tmp', 'Xtest2.tmp', 'Xtest3.tmp'] + let times = [] let result = 0 - let ts = localtime() - if a:doSleep - sleep 1 - endif + " Use three files istead of localtim(), with a network filesystem the file + " times may differ at bit let fl = ['Hello World!'] - call writefile(fl, fname) - let tf = getftime(fname) - if a:doSleep - sleep 1 - endif - let te = localtime() + for fname in fnames + call writefile(fl, fname) + call add(times, getftime(fname)) + if a:doSleep + sleep 1 + endif + endfor - let time_correct = (ts <= tf && tf <= te) + let time_correct = (times[0] <= times[1] && times[1] <= times[2]) if a:doSleep || time_correct - call assert_true(time_correct) - call assert_equal(strlen(fl[0] . "\n"), getfsize(fname)) - call assert_equal('file', getftype(fname)) - call assert_equal('rw-', getfperm(fname)[0:2]) + call assert_true(time_correct, printf('Expected %s <= %s <= %s', times[0], times[1], times[2])) + call assert_equal(strlen(fl[0] . "\n"), getfsize(fnames[0])) + call assert_equal('file', getftype(fnames[0])) + call assert_equal('rw-', getfperm(fnames[0])[0:2]) let result = 1 endif - call delete(fname) + for fname in fnames + call delete(fname) + endfor return result endfunc |