From fdd59ef901ad5439fc5f0be4125c67b31d131447 Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Sat, 19 May 2018 12:30:49 +0200 Subject: vim-patch:8.0.0559: setting ttytype to xxx does not always fail Problem: Setting ttytype to xxx does not always fail as expected. (Marvin Schmidt) Solution: Catch both possible errors. (closes vim/vim#1601) https://github.com/vim/vim/commit/f803a7697808f63949ea26fc256d4c9a8647089e --- src/nvim/testdir/test_options.vim | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/nvim/testdir/test_options.vim b/src/nvim/testdir/test_options.vim index 738c703b7f..eb42e35bd3 100644 --- a/src/nvim/testdir/test_options.vim +++ b/src/nvim/testdir/test_options.vim @@ -238,10 +238,22 @@ func Test_set_ttytype() set ttytype=xterm call assert_equal('xterm', &ttytype) call assert_equal(&ttytype, &term) - " FIXME: "set ttytype=" gives E522 instead of E529 - " in travis on some builds. Why? Commented out this test for now. - " call assert_fails('set ttytype=', 'E529:') - call assert_fails('set ttytype=xxx', 'E522:') + " "set ttytype=" gives E522 instead of E529 + " in travis on some builds. Why? Catch both for now + try + set ttytype= + call assert_report('set ttype= did not fail') + catch /E529\|E522/ + endtry + + " Some systems accept any terminal name and return dumb settings, + " check for failure of finding the entry and for missing 'cm' entry. + try + set ttytype=xxx + call assert_report('set ttype=xxx did not fail') + catch /E522\|E437/ + endtry + set ttytype& call assert_equal(&ttytype, &term) endif -- cgit