1 files changed, 24 insertions, 1 deletions
diff --git a/test/functional/shada/shada_spec.lua b/test/functional/shada/shada_spec.lua
index 683d520627..32598fc399 100644
--- a/test/functional/shada/shada_spec.lua
+++ b/test/functional/shada/shada_spec.lua
@@ -1,10 +1,11 @@
 -- Other ShaDa tests
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local meths, nvim_command, funcs, eq =
   helpers.meths, helpers.command, helpers.funcs, helpers.eq
 local write_file, spawn, set_session, nvim_prog, exc_exec =
   helpers.write_file, helpers.spawn, helpers.set_session, helpers.nvim_prog,
   helpers.exc_exec
+
 local lfs = require('lfs')
 local paths = require('test.config.paths')
 
@@ -14,15 +15,20 @@ local shada_helpers = require('test.functional.shada.helpers')
 local reset, clear, get_shada_rw =
   shada_helpers.reset, shada_helpers.clear, shada_helpers.get_shada_rw
 local read_shada_file = shada_helpers.read_shada_file
+local set_additional_cmd = shada_helpers.set_additional_cmd
 
 local wshada, _, shada_fname, clean =
   get_shada_rw('Xtest-functional-shada-shada.shada')
 
+local dirname = 'Xtest-functional-shada-shada.d'
+local dirshada = dirname .. '/main.shada'
+
 describe('ShaDa support code', function()
   before_each(reset)
   after_each(function()
     clear()
     clean()
+    lfs.rmdir(dirname)
   end)
 
   it('preserves `s` item size limit with unknown entries', function()
@@ -165,6 +171,7 @@ describe('ShaDa support code', function()
   end
 
   it('correctly uses shada-r option', function()
+    nvim_command('set shellslash')
     meths.set_var('__home', paths.test_source_path)
     nvim_command('let $HOME = __home')
     nvim_command('unlet __home')
@@ -188,6 +195,7 @@ describe('ShaDa support code', function()
   end)
 
   it('correctly ignores case with shada-r option', function()
+    nvim_command('set shellslash')
     local pwd = funcs.getcwd()
     local relfname = 'абв/test'
     local fname = pwd .. '/' .. relfname
@@ -230,4 +238,19 @@ describe('ShaDa support code', function()
     eq('', meths.get_option('viminfo'))
     eq('', meths.get_option('shada'))
   end)
+
+  it('does not crash when ShaDa file directory is not writable', function()
+    if helpers.pending_win32(pending) then return end
+
+    funcs.mkdir(dirname, '', 0)
+    eq(0, funcs.filewritable(dirname))
+    set_additional_cmd('set shada=')
+    reset(dirshada)
+    meths.set_option('shada', '\'10')
+    eq('Vim(wshada):E886: System error while opening ShaDa file '
+       .. 'Xtest-functional-shada-shada.d/main.shada for reading to merge '
+       .. 'before writing it: permission denied',
+       exc_exec('wshada'))
+    meths.set_option('shada', '')
+  end)
 end)