Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-28 13:53:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix bind unit tests

Browse source 
In my rush to get the fix for the wrong default Vi mode escape delay merged
(commit 3e24ae80b3) I neglected to update the
unit test. This change corrects that oversight.

Cherry-picked from 5092904ea3
This commit is contained in:
Kurtis Rader 2016-04-28 21:12:58 -07:00 committed by ridiculousfish
parent 54319435f4
commit f44ef3ad3f
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
tests/bind.expect
View file

@ -60,7 +60,7 @@ expect_prompt -re {\r\nsuccess: default escape timeout\r\n} {
# Verify the default timeout has been set to the expected value. # Verify the default timeout has been set to the expected value.
send "echo fish_escape_delay_ms=\$fish_escape_delay_ms\r" send "echo fish_escape_delay_ms=\$fish_escape_delay_ms\r"
expect_prompt -re {\r\nfish_escape_delay_ms=10\r\n} { expect_prompt -re {\r\nfish_escape_delay_ms=100\r\n} {
puts "vi-mode default timeout set correctly" puts "vi-mode default timeout set correctly"
} unmatched { } unmatched {
puts stderr "vi-mode default timeout not set correctly" puts stderr "vi-mode default timeout not set correctly"
@ -71,7 +71,7 @@ send "\033"
# Delay needed to allow fish to transition to vi "normal" mode. The delay is # Delay needed to allow fish to transition to vi "normal" mode. The delay is
# longer than strictly necessary to let fish catch up as it may be slow due to # longer than strictly necessary to let fish catch up as it may be slow due to
# ASAN. # ASAN.
sleep 0.100 sleep 0.150
send "ddi" send "ddi"
send "echo success: default escape timeout\r" send "echo success: default escape timeout\r"
expect_prompt -re {\r\nsuccess: default escape timeout\r\n} { expect_prompt -re {\r\nsuccess: default escape timeout\r\n} {
@ -84,7 +84,7 @@ expect_prompt -re {\r\nsuccess: default escape timeout\r\n} {
# binding but should be valid while in vi insert or normal mode). # binding but should be valid while in vi insert or normal mode).
send "echo abc def" send "echo abc def"
send "\033" send "\033"
sleep 0.005 sleep 0.010
send "t\r" send "t\r"
expect_prompt -re {\r\ndef abc\r\n} { expect_prompt -re {\r\ndef abc\r\n} {
puts "vi transpose words, default timeout: short delay" puts "vi transpose words, default timeout: short delay"
@ -96,7 +96,7 @@ expect_prompt -re {\r\ndef abc\r\n} {
send "echo TEXT" send "echo TEXT"
send "\033" send "\033"
# Delay needed to allow fish to transition to vi "normal" mode. # Delay needed to allow fish to transition to vi "normal" mode.
sleep 0.100 sleep 0.150
send "hhrAi\r" send "hhrAi\r"
expect_prompt -re {\r\nTAXT\r\n} { expect_prompt -re {\r\nTAXT\r\n} {
puts "vi mode replace char, default timeout: long delay" puts "vi mode replace char, default timeout: long delay"
@ -105,7 +105,7 @@ expect_prompt -re {\r\nTAXT\r\n} {
} }
# Verify that changing the escape timeout has an effect. # Verify that changing the escape timeout has an effect.
send "set -g fish_escape_delay_ms 100\r" send "set -g fish_escape_delay_ms 200\r"
expect_prompt expect_prompt
send "echo fail: lengthened escape timeout" send "echo fail: lengthened escape timeout"
@ -123,7 +123,7 @@ expect_prompt -re {\r\nsuccess: lengthened escape timeout\r\n} {
# after sending escape. # after sending escape.
send "echo fail: no normal mode" send "echo fail: no normal mode"
send "\033" send "\033"
sleep 0.050 sleep 0.100
send "ddi" send "ddi"
send "inserted\r" send "inserted\r"
expect_prompt -re {\r\nfail: no normal modediinserted\r\n} { expect_prompt -re {\r\nfail: no normal modediinserted\r\n} {
@ -151,14 +151,18 @@ expect_prompt -re {\r\nTENT\r\n} {
send "set -g fish_key_bindings fish_default_key_bindings\r" send "set -g fish_key_bindings fish_default_key_bindings\r"
expect_prompt expect_prompt
# Verify the custom escape timeout of 100ms set earlier is still in effect. # Verify the custom escape timeout of 200ms set earlier is still in effect.
send "echo fish_escape_delay_ms=\$fish_escape_delay_ms\r" send "echo fish_escape_delay_ms=\$fish_escape_delay_ms\r"
expect_prompt -re {\r\nfish_escape_delay_ms=100\r\n} { expect_prompt -re {\r\nfish_escape_delay_ms=200\r\n} {
puts "default-mode custom timeout set correctly" puts "default-mode custom timeout set correctly"
} unmatched { } unmatched {
puts stderr "default-mode custom timeout not set correctly" puts stderr "default-mode custom timeout not set correctly"
} }
# Reset it to 100ms.
send "set -g fish_escape_delay_ms 100\r"
expect_prompt
# Verify the emacs transpose word (\et) behavior using various delays, # Verify the emacs transpose word (\et) behavior using various delays,
# including none, after the escape character. # including none, after the escape character.