test/old: cherry-pick patch v8.1.1955 changes for test_trycatch.vim

6 files changed, 6 insertions, 6 deletions

diff --git a/src/nvim/testdir/runtest.vim b/src/nvim/testdir/runtest.vim
index b02514143c..275edece1e 100644
--- a/src/nvim/testdir/runtest.vim
+++ b/src/nvim/testdir/runtest.vim
@@ -414,7 +414,7 @@ for s:test in sort(s:tests)
 
   " Repeat a flaky test.  Give up when:
   " - it fails again with the same message
-  " - it fails five times (with a different mesage)
+  " - it fails five times (with a different message)
   if len(v:errors) > 0
         \ && (index(s:flaky_tests, s:test) >= 0
         \      || v:errors[0] =~ s:flaky_errors_re)
diff --git a/src/nvim/testdir/test49.vim b/src/nvim/testdir/test49.vim
index 5468f7c4aa..3322d25cd8 100644
--- a/src/nvim/testdir/test49.vim
+++ b/src/nvim/testdir/test49.vim
@@ -521,7 +521,7 @@ endfunction
 "
 " Create a script that consists of the body of the function a:funcname.
 " Replace any ":return" by a ":finish", any argument variable by a global
-" variable, and and every ":call" by a ":source" for the next following argument
+" variable, and every ":call" by a ":source" for the next following argument
 " in the variable argument list.  This function is useful if similar tests are
 " to be made for a ":return" from a function call or a ":finish" in a script
 " file.
diff --git a/src/nvim/testdir/test_const.vim b/src/nvim/testdir/test_const.vim
index fc7ea71f6e..ea69c8cba4 100644
--- a/src/nvim/testdir/test_const.vim
+++ b/src/nvim/testdir/test_const.vim
@@ -109,7 +109,7 @@ func Test_define_script_var_with_lock()
     unlet s:x
 endfunc
 
-func Test_descructuring_with_lock()
+func Test_destructuring_with_lock()
     const [a, b, c] = [1, 1.1, 'vim']
 
     call assert_fails('let a = 1', 'E741:')
diff --git a/src/nvim/testdir/test_quickfix.vim b/src/nvim/testdir/test_quickfix.vim
index e06c4f59da..5323b1acf3 100644
--- a/src/nvim/testdir/test_quickfix.vim
+++ b/src/nvim/testdir/test_quickfix.vim
@@ -1744,7 +1744,7 @@ func Test_switchbuf()
   call assert_equal(1, bufwinnr('Xqftestfile3'))
 
   " If only quickfix window is open in the current tabpage, jumping to an
-  " entry with 'switchubf' set to 'usetab' should search in other tabpages.
+  " entry with 'switchbuf' set to 'usetab' should search in other tabpages.
   enew | only
   set switchbuf=usetab
   tabedit Xqftestfile1
diff --git a/src/nvim/testdir/test_search.vim b/src/nvim/testdir/test_search.vim
index 8d71ada551..0703a6b141 100644
--- a/src/nvim/testdir/test_search.vim
+++ b/src/nvim/testdir/test_search.vim
@@ -270,7 +270,7 @@ func Test_search_cmdline2()
   " nor "/foo\<c-u>\<cr>" works to delete the commandline.
   " In that case Vim should return "E35 no previous regular expression",
   " but it looks like Vim still sees /foo and therefore the test fails.
-  " Therefore, disableing this test
+  " Therefore, disabling this test
   "call assert_fails(feedkeys("/foo\<c-w>\<cr>", 'tx'), 'E35')
   "call assert_equal({'lnum': 1, 'leftcol': 0, 'col': 0, 'topfill': 0, 'topline': 1, 'coladd': 0, 'skipcol': 0, 'curswant': 0}, winsaveview())
 
diff --git a/src/nvim/testdir/test_tabpage.vim b/src/nvim/testdir/test_tabpage.vim
index 55dff3d476..bc7c69d920 100644
--- a/src/nvim/testdir/test_tabpage.vim
+++ b/src/nvim/testdir/test_tabpage.vim
@@ -58,7 +58,7 @@ function Test_tabpage()
   q
   "
   "
-  " Test for ":tab drop multi-opend-file" to keep current tabpage and window.
+  " Test for ":tab drop multi-opened-file" to keep current tabpage and window.
   new test1
   tabnew
   new test1