patch 8.1.0262: not enough testing for getftype()
Problem: Not enough testing for getftype().
Solution: Add a test. (Dominique Pelle, closes #3300)
diff --git a/src/evalfunc.c b/src/evalfunc.c
index 31096d7..9673a1a 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -5111,7 +5111,7 @@
# endif
# ifdef S_ISSOCK
else if (S_ISSOCK(st.st_mode))
- t = "fifo";
+ t = "socket";
# endif
else
t = "other";
diff --git a/src/testdir/test_stat.vim b/src/testdir/test_stat.vim
index 307cf5e..c627266 100644
--- a/src/testdir/test_stat.vim
+++ b/src/testdir/test_stat.vim
@@ -122,6 +122,41 @@
call assert_equal('', getfperm(fname))
endfunc
+func Test_getftype()
+ call assert_equal('file', getftype(v:progpath))
+ call assert_equal('dir', getftype('.'))
+
+ if !has('unix')
+ return
+ endif
+
+ silent !ln -s Xfile Xlink
+ call assert_equal('link', getftype('Xlink'))
+ call delete('Xlink')
+
+ if executable('mkfifo')
+ silent !mkfifo Xfifo
+ call assert_equal('fifo', getftype('Xfifo'))
+ call delete('Xfifo')
+ endif
+
+ for cdevfile in systemlist('find /dev -type c -maxdepth 2 2>/dev/null')
+ call assert_equal('cdev', getftype(cdevfile))
+ endfor
+
+ for bdevfile in systemlist('find /dev -type b -maxdepth 2 2>/dev/null')
+ call assert_equal('bdev', getftype(bdevfile))
+ endfor
+
+ " The /run/ directory typically contains socket files.
+ " If it does not, test won't fail but will not test socket files.
+ for socketfile in systemlist('find /run -type s -maxdepth 2 2>/dev/null')
+ call assert_equal('socket', getftype(socketfile))
+ endfor
+
+ " TODO: file type 'other' is not tested. How can we test it?
+endfunc
+
func Test_win32_symlink_dir()
" On Windows, non-admin users cannot create symlinks.
" So we use an existing symlink for this test.
diff --git a/src/version.c b/src/version.c
index 9e2ee2e..1cd58f0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -795,6 +795,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 262,
+/**/
261,
/**/
260,