patch 8.0.1549: various small problems in test files
Problem: Various small problems in test files.
Solution: Include small changes.
diff --git a/src/testdir/shared.vim b/src/testdir/shared.vim
index b16fdce..ef85514 100644
--- a/src/testdir/shared.vim
+++ b/src/testdir/shared.vim
@@ -115,6 +115,7 @@
" Wait for up to a second for "expr" to become true. "expr" can be a
" stringified expression to evaluate, or a funcref without arguments.
+" A second argument can be used to specify a different timeout in msec.
"
" Return time slept in milliseconds. With the +reltime feature this can be
" more than the actual waiting time. Without +reltime it can also be less.
diff --git a/src/testdir/test_channel.py b/src/testdir/test_channel.py
index 6668752..bafa9db 100644
--- a/src/testdir/test_channel.py
+++ b/src/testdir/test_channel.py
@@ -62,6 +62,39 @@
if decoded[1] == 'hello!':
# simply send back a string
response = "got it"
+ elif decoded[1] == 'malformed1':
+ cmd = '["ex",":"]wrong!["ex","smi"]'
+ print("sending: {0}".format(cmd))
+ self.request.sendall(cmd.encode('utf-8'))
+ response = "ok"
+ # Need to wait for Vim to give up, otherwise it
+ # sometimes fails on OS X.
+ time.sleep(0.2)
+ elif decoded[1] == 'malformed2':
+ cmd = '"unterminated string'
+ print("sending: {0}".format(cmd))
+ self.request.sendall(cmd.encode('utf-8'))
+ response = "ok"
+ # Need to wait for Vim to give up, otherwise the double
+ # quote in the "ok" response terminates the string.
+ time.sleep(0.2)
+ elif decoded[1] == 'malformed3':
+ cmd = '["ex","missing ]"'
+ print("sending: {0}".format(cmd))
+ self.request.sendall(cmd.encode('utf-8'))
+ response = "ok"
+ # Need to wait for Vim to give up, otherwise the ]
+ # in the "ok" response terminates the list.
+ time.sleep(0.2)
+ elif decoded[1] == 'split':
+ cmd = '["ex","let '
+ print("sending: {0}".format(cmd))
+ self.request.sendall(cmd.encode('utf-8'))
+ time.sleep(0.01)
+ cmd = 'g:split = 123"]'
+ print("sending: {0}".format(cmd))
+ self.request.sendall(cmd.encode('utf-8'))
+ response = "ok"
elif decoded[1].startswith("echo "):
# send back the argument
response = decoded[1][5:]
@@ -121,39 +154,6 @@
print("sending: {0}".format(cmd))
self.request.sendall(cmd.encode('utf-8'))
response = "ok"
- elif decoded[1] == 'malformed1':
- cmd = '["ex",":"]wrong!["ex","smi"]'
- print("sending: {0}".format(cmd))
- self.request.sendall(cmd.encode('utf-8'))
- response = "ok"
- # Need to wait for Vim to give up, otherwise it
- # sometimes fails on OS X.
- time.sleep(0.2)
- elif decoded[1] == 'malformed2':
- cmd = '"unterminated string'
- print("sending: {0}".format(cmd))
- self.request.sendall(cmd.encode('utf-8'))
- response = "ok"
- # Need to wait for Vim to give up, otherwise the double
- # quote in the "ok" response terminates the string.
- time.sleep(0.2)
- elif decoded[1] == 'malformed3':
- cmd = '["ex","missing ]"'
- print("sending: {0}".format(cmd))
- self.request.sendall(cmd.encode('utf-8'))
- response = "ok"
- # Need to wait for Vim to give up, otherwise the ]
- # in the "ok" response terminates the list.
- time.sleep(0.2)
- elif decoded[1] == 'split':
- cmd = '["ex","let '
- print("sending: {0}".format(cmd))
- self.request.sendall(cmd.encode('utf-8'))
- time.sleep(0.01)
- cmd = 'g:split = 123"]'
- print("sending: {0}".format(cmd))
- self.request.sendall(cmd.encode('utf-8'))
- response = "ok"
elif decoded[1] == 'an expr':
# Send an expr request.
cmd = '["expr","setline(\\"$\\", [\\"one\\",\\"two\\",\\"three\\"])"]'
diff --git a/src/testdir/test_gui.vim b/src/testdir/test_gui.vim
index 427bab7..50a629b 100644
--- a/src/testdir/test_gui.vim
+++ b/src/testdir/test_gui.vim
@@ -16,7 +16,7 @@
endfunc
" Test for resetting "secure" flag after GUI has started.
-" Must be run first.
+" Must be run first, since it starts the GUI on Unix.
func Test_1_set_secure()
set exrc secure
gui -f
diff --git a/src/testdir/test_gui_init.vim b/src/testdir/test_gui_init.vim
index 661bf0c..638708f 100644
--- a/src/testdir/test_gui_init.vim
+++ b/src/testdir/test_gui_init.vim
@@ -17,7 +17,7 @@
endfunc
" Ignore the "failed to create input context" error.
-call test_ignore_error('E285')
+call test_ignore_error('E285:')
" Start the GUI now, in the foreground.
gui -f
diff --git a/src/testdir/test_vimscript.vim b/src/testdir/test_vimscript.vim
index d653fa5..fc002c2 100644
--- a/src/testdir/test_vimscript.vim
+++ b/src/testdir/test_vimscript.vim
@@ -1,4 +1,4 @@
-" Test various aspects of the Vim language.
+" Test various aspects of the Vim script language.
" Most of this was formerly in test49.
"-------------------------------------------------------------------------------