aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/nvim/testdir/test_options.vim20
1 files changed, 16 insertions, 4 deletions
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