OSDN > Finden Software > Vim > SCM > hg > vim > Commit

Vim
Fork

vim: Commit

Mirror of the Vim source from https://github.com/vim/vim

patch 8.2.0456: Test_confirm_cmd is flaky

Commit: https://github.com/vim/vim/commit/72749f062f15c7147f512bc581695c25ad78fb4e
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Mar 26 20:51:43 2020 +0100

patch 8.2.0456: Test_confirm_cmd is flaky

Problem: Test_confirm_cmd is flaky.
Solution: Add a term_wait() call. (closes https://github.com/vim/vim/issues/5854)

diff -r ab0a91ba7a13 -r bde8020fb283 src/testdir/test_excmd.vim

--- a/src/testdir/test_excmd.vim Thu Mar 26 20:45:04 2020 +0100

+++ b/src/testdir/test_excmd.vim Thu Mar 26 21:00:04 2020 +0100

		@@ -242,6 +242,11 @@
242	242	call assert_equal(['foo4'], readfile('foo'))
243	243	call assert_equal(['bar2'], readfile('bar'))
244	244
	245	+ call delete('foo')
	246	+ call delete('bar')
	247	+endfunc
	248	+
	249	+func Test_confirm_cmd_cancel()
245	250	" Test for closing a window with a modified buffer
246	251	let buf = RunVimInTerminal('', {'rows': 20})
247	252	call term_sendkeys(buf, ":set nomore\n")

		@@ -251,14 +256,12 @@
251	256	call WaitForAssert({-> assert_match('^\[Y\]es, (N)o, (C)ancel: *$',
252	257	\ term_getline(buf, 20))}, 1000)
253	258	call term_sendkeys(buf, "C")
	259	+ call term_wait(buf, 50)
254	260	call term_sendkeys(buf, ":confirm close\n")
255	261	call WaitForAssert({-> assert_match('^\[Y\]es, (N)o, (C)ancel: *$',
256	262	\ term_getline(buf, 20))}, 1000)
257	263	call term_sendkeys(buf, "N")
258	264	call StopVimInTerminal(buf)
259		-
260		- call delete('foo')
261		- call delete('bar')
262	265	endfunc
263	266
264	267	" Test for the :print command

diff -r ab0a91ba7a13 -r bde8020fb283 src/version.c

--- a/src/version.c Thu Mar 26 20:45:04 2020 +0100

+++ b/src/version.c Thu Mar 26 21:00:04 2020 +0100

		@@ -739,6 +739,8 @@
739	739	static int included_patches[] =
740	740	{ /* Add new patch number below this line */
741	741	/**/
	742	+ 456,
	743	+/**/
742	744	455,
743	745	/**/
744	746	454,