patch 8.2.1340: some tests fail on Cirrus CI and/or with FreeBSD
Problem: Some tests fail on Cirrus CI and/or with FreeBSD.
Solution: Make 'backupskip' empty. Do not run tests as root. Check for
directory when using viminfo. (Ozaki Kiichi, closes #6596)
diff --git a/src/testdir/test_backup.vim b/src/testdir/test_backup.vim
index 0d3e79c..4c7abe8 100644
--- a/src/testdir/test_backup.vim
+++ b/src/testdir/test_backup.vim
@@ -19,6 +19,22 @@
call delete('Xbackup.txt~')
endfunc
+func Test_backup_backupskip()
+ set backup backupdir=. backupskip=*.txt
+ new
+ call setline(1, ['line1', 'line2'])
+ :f Xbackup.txt
+ :w! Xbackup.txt
+ " backup file is only created after
+ " writing a second time (before overwriting)
+ :w! Xbackup.txt
+ call assert_false(filereadable('Xbackup.txt~'))
+ bw!
+ set backup&vim backupdir&vim backupskip&vim
+ call delete('Xbackup.txt')
+ call delete('Xbackup.txt~')
+endfunc
+
func Test_backup2()
set backup backupdir=.// backupskip=
new
@@ -30,7 +46,7 @@
:w! Xbackup.txt
sp *Xbackup.txt~
call assert_equal(['line1', 'line2', 'line3'], getline(1,'$'))
- let f=expand('%')
+ let f = expand('%')
call assert_match('%testdir%Xbackup.txt\~', f)
bw!
bw!
@@ -50,7 +66,7 @@
:w! Xbackup.txt
sp *Xbackup.txt~
call assert_equal(['line1', 'line2', 'line3'], getline(1,'$'))
- let f=expand('%')
+ let f = expand('%')
call assert_match('%testdir%Xbackup.txt\~', f)
bw!
bw!
@@ -61,14 +77,11 @@
" Test for using a non-existing directory as a backup directory
func Test_non_existing_backupdir()
- CheckNotBSD
- let save_backup = &backupdir
- set backupdir=./non_existing_dir
+ set backupdir=./non_existing_dir backupskip=
call writefile(['line1'], 'Xfile')
new Xfile
- " TODO: write doesn't fail in Cirrus FreeBSD CI test
call assert_fails('write', 'E510:')
- let &backupdir = save_backup
+ set backupdir&vim backupskip&vim
call delete('Xfile')
endfunc
diff --git a/src/testdir/test_edit.vim b/src/testdir/test_edit.vim
index 0200d9f..5277d20 100644
--- a/src/testdir/test_edit.vim
+++ b/src/testdir/test_edit.vim
@@ -1682,7 +1682,6 @@
" Test for editing a file without read permission
func Test_edit_file_no_read_perm()
CheckUnix
- CheckNotBSD
call writefile(['one', 'two'], 'Xfile')
call setfperm('Xfile', '-w-------')
new
diff --git a/src/testdir/test_viminfo.vim b/src/testdir/test_viminfo.vim
index 258b472..bc8afa0 100644
--- a/src/testdir/test_viminfo.vim
+++ b/src/testdir/test_viminfo.vim
@@ -807,7 +807,7 @@
" Try to write the viminfo to a directory
call mkdir('Xdir')
- call assert_fails('wviminfo Xdir', 'E886:')
+ call assert_fails('wviminfo Xdir', 'E137:')
call delete('Xdir', 'rf')
endfunc
diff --git a/src/testdir/test_writefile.vim b/src/testdir/test_writefile.vim
index d6e7e64..e580930 100644
--- a/src/testdir/test_writefile.vim
+++ b/src/testdir/test_writefile.vim
@@ -136,9 +136,7 @@
endfunc
func Test_writefile_sync_dev_stdout()
- if !has('unix')
- return
- endif
+ CheckUnix
if filewritable('/dev/stdout')
" Just check that this doesn't cause an error.
call writefile(['one'], '/dev/stdout')
@@ -371,13 +369,10 @@
" Test for writing to a readonly file
func Test_write_readonly()
- " In Cirrus-CI, the freebsd tests are run under a root account. So this test
- " doesn't fail.
- CheckNotBSD
call writefile([], 'Xfile')
call setfperm('Xfile', "r--------")
edit Xfile
- set noreadonly
+ set noreadonly backupskip=
call assert_fails('write', 'E505:')
let save_cpo = &cpo
set cpo+=W
@@ -386,37 +381,32 @@
call setline(1, ['line1'])
write!
call assert_equal(['line1'], readfile('Xfile'))
+ set backupskip&
call delete('Xfile')
endfunc
" Test for 'patchmode'
func Test_patchmode()
- CheckNotBSD
call writefile(['one'], 'Xfile')
- set patchmode=.orig nobackup writebackup
+ set patchmode=.orig nobackup backupskip= writebackup
new Xfile
call setline(1, 'two')
" first write should create the .orig file
write
- " TODO: Xfile.orig is not created in Cirrus FreeBSD CI test
call assert_equal(['one'], readfile('Xfile.orig'))
call setline(1, 'three')
" subsequent writes should not create/modify the .orig file
write
call assert_equal(['one'], readfile('Xfile.orig'))
- set patchmode& backup& writebackup&
+ set patchmode& backup& backupskip& writebackup&
call delete('Xfile')
call delete('Xfile.orig')
endfunc
" Test for writing to a file in a readonly directory
func Test_write_readonly_dir()
- if !has('unix') || has('bsd')
- " On MS-Windows, modifying files in a read-only directory is allowed.
- " In Cirrus-CI for Freebsd, tests are run under a root account where
- " modifying files in a read-only directory are allowed.
- return
- endif
+ " On MS-Windows, modifying files in a read-only directory is allowed.
+ CheckUnix
call mkdir('Xdir')
call writefile(['one'], 'Xdir/Xfile1')
call setfperm('Xdir', 'r-xr--r--')
@@ -426,12 +416,12 @@
call assert_fails('write', 'E212:')
" try to create a backup file in the directory
edit! Xdir/Xfile1
- set backupdir=./Xdir
+ set backupdir=./Xdir backupskip=
set patchmode=.orig
call assert_fails('write', 'E509:')
call setfperm('Xdir', 'rwxr--r--')
call delete('Xdir', 'rf')
- set backupdir& patchmode&
+ set backupdir& backupskip& patchmode&
endfunc
" Test for writing a file using invalid file encoding