diff options
author | Oliver Kiddle <opk@zsh.org> | 2014-11-17 16:19:12 +0100 |
---|---|---|
committer | Oliver Kiddle <opk@zsh.org> | 2014-11-17 16:29:10 +0100 |
commit | c95c2ac838e04e507f8e4d9bd0ed4d966306a9b9 (patch) | |
tree | ba667cf81a36094518153e34b0ef854cfc457b0c | |
parent | 25cc978a99aae07604f4c84dd2e82d3669c2c61c (diff) | |
download | zsh-c95c2ac838e04e507f8e4d9bd0ed4d966306a9b9.tar.gz zsh-c95c2ac838e04e507f8e4d9bd0ed4d966306a9b9.tar.xz zsh-c95c2ac838e04e507f8e4d9bd0ed4d966306a9b9.zip |
33699: support short delays in zle tests where we
need KEYTIMEOUT to elapse
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | Test/X02zlevi.ztst | 6 | ||||
-rw-r--r-- | Test/comptest | 12 |
3 files changed, 20 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 279b45f86..1491234a3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-11-17 Oliver Kiddle <opk@zsh.org> + + * 33699: Test/X02zlevi.ztst, Test/comptest: support short + delays in zle tests where we need KEYTIMEOUT to elapse + 2014-11-16 Oliver Kiddle <opk@zsh.org> * 33633: Src/Zle/zle_vi.c: support vim style text objects diff --git a/Test/X02zlevi.ztst b/Test/X02zlevi.ztst index 4210a72cc..297fb9aee 100644 --- a/Test/X02zlevi.ztst +++ b/Test/X02zlevi.ztst @@ -37,6 +37,12 @@ >3 >CURSOR: 5 + zletest $'\e' $'~aI\e' $'~o\e' \~ +0:swap case on a blank line +>BUFFER: i +> +>CURSOR: 2 + zletest $' four\eO\C-v\tthree\eO two\eOone\e3J' 0:join lines with line count >BUFFER: one two three diff --git a/Test/comptest b/Test/comptest index 96072fdcc..654c0f168 100644 --- a/Test/comptest +++ b/Test/comptest @@ -36,6 +36,7 @@ comptestinit () { 'LISTMAX=10000000 stty 38400 columns 80 rows 24 werase undef TERM=vt100 +KEYTIMEOUT=1 setopt zle autoload -U compinit compinit -u @@ -159,9 +160,14 @@ comptest () { } zletest () { - input="$*" - # zpty_flush Before zletest - zpty -n -w zsh "$input"$'\C-X' + local first=0 + for input; do + # sleep for $KEYTIMEOUT + (( first++ )) && read -t 0.011 -k 1 < /dev/null + # zpty_flush Before zletest + zpty -n -w zsh "$input" + done + zpty -n -w zsh $'\C-X' zpty -r -m zsh log "*<WIDGET><finish>*<PROMPT>*" || { print "failed to invoke finish widget." return 1 |