patch 8.1.0509: checking cwd not accessible fails for root
Problem: Checking cwd not accessible fails for root. (James McCoy)
Solution: Skip this part of the test for root. (closes #3595)
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index 235cd31..88cb89e 100644
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -490,14 +490,17 @@
call assert_fails("call term_start(&shell, {'cwd': 'Xdir'})", 'E475:')
" Case 3: Directory exists but is not accessible.
- call mkdir('Xdir', '', '0600')
- " return early if the directory permissions could not be set properly
- if getfperm('Xdir')[2] == 'x'
- call delete('Xdir', 'rf')
- return
+ " Skip this for root, it will be accessible anyway.
+ if $USER != 'root'
+ call mkdir('XdirNoAccess', '', '0600')
+ " return early if the directory permissions could not be set properly
+ if getfperm('XdirNoAccess')[2] == 'x'
+ call delete('XdirNoAccess', 'rf')
+ return
+ endif
+ call assert_fails("call term_start(&shell, {'cwd': 'XdirNoAccess'})", 'E475:')
+ call delete('XdirNoAccess', 'rf')
endif
- call assert_fails("call term_start(&shell, {'cwd': 'Xdir'})", 'E475:')
- call delete('Xdir', 'rf')
endfunc
func Test_terminal_servername()
diff --git a/src/version.c b/src/version.c
index 1e66b3e..fb8a16d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -793,6 +793,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 509,
+/**/
508,
/**/
507,