summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-04-27 17:32:40 +0200
committerBram Moolenaar <Bram@vim.org>2019-04-27 17:32:40 +0200
commit520e245237fa92f9022968a52eb418da6eade9b4 (patch)
tree53301ad178a4d0e728b39ea6b056b11ddaaa8eb2
parente61e548dd6a20471fd81160b1c2a16089505ec8c (diff)
downloadvim-git-520e245237fa92f9022968a52eb418da6eade9b4.tar.gz
patch 8.1.1212: signal PWR is not testedv8.1.1212
Problem: Signal PWR is not tested. Solution: Test that PWR updates the swap file. (Dominique Pelle, closes #4312)
-rw-r--r--src/testdir/test_signals.vim50
-rw-r--r--src/version.c2
2 files changed, 41 insertions, 11 deletions
diff --git a/src/testdir/test_signals.vim b/src/testdir/test_signals.vim
index af7b88201..5dec1d32b 100644
--- a/src/testdir/test_signals.vim
+++ b/src/testdir/test_signals.vim
@@ -4,18 +4,17 @@ if !has('unix')
finish
endif
-if has('gui_running')
- " Signals only work for terminals, and won't work for GUI.
- finish
-endif
-
source shared.vim
+" Check whether a signal is available on this system.
+func HasSignal(signal)
+ let signals = system('kill -l')
+ return signals =~# '\<' .. a:signal .. '\>'
+endfunc
+
" Test signal WINCH (window resize signal)
func Test_signal_WINCH()
- let signals = system('kill -l')
- if signals !~ '\<WINCH\>'
- " signal WINCH is not available, skip the test.
+ if has('gui_running') || !HasSignal('WINCH')
return
endif
@@ -31,15 +30,15 @@ func Test_signal_WINCH()
let new_lines = &lines - 2
let new_columns = &columns - 2
- exe 'set lines=' . new_lines
- exe 'set columns=' . new_columns
+ exe 'set lines=' .. new_lines
+ exe 'set columns=' .. new_columns
call assert_equal(new_lines, &lines)
call assert_equal(new_columns, &columns)
" Send signal and wait for signal to be processed.
" 'lines' and 'columns' should have been restored
" after handing signal WINCH.
- exe 'silent !kill -s WINCH ' . getpid()
+ exe 'silent !kill -s WINCH ' .. getpid()
call WaitForAssert({-> assert_equal(old_lines, &lines)})
call assert_equal(old_columns, &columns)
@@ -47,3 +46,32 @@ func Test_signal_WINCH()
let &t_WS = old_WS
endif
endfunc
+
+" Test signal PWR, which should update the swap file.
+func Test_signal_PWR()
+ if !HasSignal('PWR')
+ return
+ endif
+
+ " Set a very large 'updatetime' and 'updatecount', so that we can be sure
+ " that swap file is updated as a result of sending PWR signal, and not
+ " because of exceeding 'updatetime' or 'updatecount' when changing buffer.
+ set updatetime=100000 updatecount=100000
+ new Xtest_signal_PWR
+ let swap_name = swapname('%')
+ call setline(1, '123')
+ preserve
+ let swap_content = readfile(swap_name, 'b')
+
+ " Update the buffer and check that the swap file is not yet updated,
+ " since we set 'updatetime' and 'updatecount' to large values.
+ call setline(1, 'abc')
+ call assert_equal(swap_content, readfile(swap_name, 'b'))
+
+ " Sending PWR signal should update the swap file.
+ exe 'silent !kill -s PWR ' .. getpid()
+ call WaitForAssert({-> assert_notequal(swap_content, readfile(swap_name, 'b'))})
+
+ bwipe!
+ set updatetime& updatecount&
+endfunc
diff --git a/src/version.c b/src/version.c
index dbf577d1b..704ff5482 100644
--- a/src/version.c
+++ b/src/version.c
@@ -768,6 +768,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1212,
+/**/
1211,
/**/
1210,