Merge remote-tracking branch 'upstream/master' into colorcolcharcolorcolchar

1 files changed, 0 insertions, 110 deletions

diff --git a/src/nvim/testdir/test_delete.vim b/src/nvim/testdir/test_delete.vim
deleted file mode 100644
index 6b49f153c6..0000000000
--- a/src/nvim/testdir/test_delete.vim
+++ /dev/null
@@ -1,110 +0,0 @@
-" Test for delete().
-
-source check.vim
-
-func Test_file_delete()
-  split Xfile
-  call setline(1, ['a', 'b'])
-  wq
-  call assert_equal(['a', 'b'], readfile('Xfile'))
-  call assert_equal(0, delete('Xfile'))
-  call assert_fails('call readfile("Xfile")', 'E484:')
-  call assert_equal(-1, delete('Xfile'))
-  bwipe Xfile
-endfunc
-
-func Test_dir_delete()
-  call mkdir('Xdir1')
-  call assert_true(isdirectory('Xdir1'))
-  call assert_equal(0, delete('Xdir1', 'd'))
-  call assert_false(isdirectory('Xdir1'))
-  call assert_equal(-1, delete('Xdir1', 'd'))
-endfunc
-
-func Test_recursive_delete()
-  call mkdir('Xdir1')
-  call mkdir('Xdir1/subdir')
-  call mkdir('Xdir1/empty')
-  split Xdir1/Xfile
-  call setline(1, ['a', 'b'])
-  w
-  w Xdir1/subdir/Xfile
-  close
-  call assert_true(isdirectory('Xdir1'))
-  call assert_equal(['a', 'b'], readfile('Xdir1/Xfile'))
-  call assert_true(isdirectory('Xdir1/subdir'))
-  call assert_equal(['a', 'b'], readfile('Xdir1/subdir/Xfile'))
-  call assert_true('Xdir1/empty'->isdirectory())
-  call assert_equal(0, delete('Xdir1', 'rf'))
-  call assert_false(isdirectory('Xdir1'))
-  call assert_equal(-1, delete('Xdir1', 'd'))
-  bwipe Xdir1/Xfile
-  bwipe Xdir1/subdir/Xfile
-endfunc
-
-func Test_symlink_delete()
-  CheckUnix
-  split Xfile
-  call setline(1, ['a', 'b'])
-  wq
-  silent !ln -s Xfile Xlink
-  " Delete the link, not the file
-  call assert_equal(0, delete('Xlink'))
-  call assert_equal(-1, delete('Xlink'))
-  call assert_equal(0, delete('Xfile'))
-  bwipe Xfile
-endfunc
-
-func Test_symlink_dir_delete()
-  CheckUnix
-  call mkdir('Xdir1')
-  silent !ln -s Xdir1 Xlink
-  call assert_true(isdirectory('Xdir1'))
-  call assert_true(isdirectory('Xlink'))
-  " Delete the link, not the directory
-  call assert_equal(0, delete('Xlink'))
-  call assert_equal(-1, delete('Xlink'))
-  call assert_equal(0, delete('Xdir1', 'd'))
-endfunc
-
-func Test_symlink_recursive_delete()
-  CheckUnix
-  call mkdir('Xdir3')
-  call mkdir('Xdir3/subdir')
-  call mkdir('Xdir4')
-  split Xdir3/Xfile
-  call setline(1, ['a', 'b'])
-  w
-  w Xdir3/subdir/Xfile
-  w Xdir4/Xfile
-  close
-  silent !ln -s ../Xdir4 Xdir3/Xlink
-
-  call assert_true(isdirectory('Xdir3'))
-  call assert_equal(['a', 'b'], readfile('Xdir3/Xfile'))
-  call assert_true(isdirectory('Xdir3/subdir'))
-  call assert_equal(['a', 'b'], readfile('Xdir3/subdir/Xfile'))
-  call assert_true(isdirectory('Xdir4'))
-  call assert_true(isdirectory('Xdir3/Xlink'))
-  call assert_equal(['a', 'b'], readfile('Xdir4/Xfile'))
-
-  call assert_equal(0, delete('Xdir3', 'rf'))
-  call assert_false(isdirectory('Xdir3'))
-  call assert_equal(-1, delete('Xdir3', 'd'))
-  " symlink is deleted, not the directory it points to
-  call assert_true(isdirectory('Xdir4'))
-  call assert_equal(['a', 'b'], readfile('Xdir4/Xfile'))
-  call assert_equal(0, delete('Xdir4/Xfile'))
-  call assert_equal(0, delete('Xdir4', 'd'))
-
-  bwipe Xdir3/Xfile
-  bwipe Xdir3/subdir/Xfile
-  bwipe Xdir4/Xfile
-endfunc
-
-func Test_delete_errors()
-  call assert_fails('call delete('''')', 'E474:')
-  call assert_fails('call delete(''foo'', 0)', 'E15:')
-endfunc
-
-" vim: shiftwidth=2 sts=2 expandtab