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

make travis-ci happy again

Browse source
This commit is contained in:
Kurtis Rader 2016-01-23 18:24:54 -08:00 committed by ridiculousfish
parent 0dac245b58
commit 4e465ee04c
2 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
tests/bind.expect
View file

@ -8,18 +8,27 @@ expect_prompt
send "set -g fish_key_bindings fish_vi_key_bindings\r" send "set -g fish_key_bindings fish_vi_key_bindings\r"
expect_prompt expect_prompt
# This test is only present to make the Travis-CI framework succeed
# consistently. It's not clear why the following tests succeed without this
# test when executed on a local machine but not in the Travis-CI framework.
send "echo success: default escape timeout\r"
expect_prompt -re {\r\nsuccess: default escape timeout\r\n} {
puts "prime vi mode: default escape timeout"
} unmatched {
puts stderr "prime vi mode fail: default escape timeout"
}
send "echo fail: default escape timeout" send "echo fail: default escape timeout"
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.510 sleep 0.550
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} {
puts "vi replace line: default escape timeout" puts "vi replace line: default escape timeout"
} -nounmatched -re {\r\nfail} {
puts stderr "vi replace line fail: default escape timeout"
} unmatched { } unmatched {
puts stderr "couldn't find expected output: replace line, default escape timeout" puts stderr "vi replace line fail: default escape timeout"
} }
# Verify that a human can transpose words using \et (which is an emacs default # Verify that a human can transpose words using \et (which is an emacs default
@ -40,7 +49,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.510 sleep 0.550
send "hhrAi\r" send "hhrAi\r"
expect_prompt -re {\r\nTAXT\r\n} { expect_prompt -re {\r\nTAXT\r\n} {
puts "vi mode replace: default escape timeout" puts "vi mode replace: default escape timeout"
@ -56,7 +65,7 @@ send "set -g fish_escape_delay_ms 100\r"
expect_prompt expect_prompt
send "echo fail: shortened escape timeout" send "echo fail: shortened escape timeout"
send "\033" send "\033"
sleep 0.110 sleep 0.150
send "ddi" send "ddi"
send "echo success: shortened escape timeout\r" send "echo success: shortened escape timeout\r"
expect_prompt -re {\r\nsuccess: shortened escape timeout\r\n} { expect_prompt -re {\r\nsuccess: shortened escape timeout\r\n} {
@ -100,6 +109,7 @@ expect_prompt -re {\r\ndef abc\r\n} {
# the words. # the words.
send "set -g fish_escape_delay_ms 100\r" send "set -g fish_escape_delay_ms 100\r"
expect_prompt expect_prompt
send "echo ghi jkl" send "echo ghi jkl"
send "\033" send "\033"
sleep 0.050 sleep 0.050
@ -114,7 +124,7 @@ expect_prompt -re {\r\njkl ghi\r\n} {
# occur and the "t" should become part of the text that is echoed. # occur and the "t" should become part of the text that is echoed.
send "echo mno pqr" send "echo mno pqr"
send "\033" send "\033"
sleep 0.110 sleep 0.150
send "t\r" send "t\r"
expect_prompt -re {\r\nmno pqrt\r\n} { expect_prompt -re {\r\nmno pqrt\r\n} {
puts "emacs transpose words: long escape delay" puts "emacs transpose words: long escape delay"

1
tests/bind.expect.out
View file

@ -1,3 +1,4 @@
prime vi mode: default escape timeout
vi replace line: default escape timeout vi replace line: default escape timeout
vi transpose words: default escape timeout vi transpose words: default escape timeout
vi mode replace: default escape timeout vi mode replace: default escape timeout