aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests
diff options
context:
space:
mode:
authorGravatar Kurtis Rader <krader@skepticism.us>2016-01-23 18:24:54 -0800
committerGravatar ridiculousfish <corydoras@ridiculousfish.com>2016-02-04 13:38:55 -0800
commit4e465ee04cf574fcf355ae5ca953b4baa9d93e0a (patch)
tree4cd0d1c2cc8831acbfa5d30d82588916262b4d14 /tests
parent0dac245b580451f8129fee1974bf017ed51230c1 (diff)
make travis-ci happy again
Diffstat (limited to 'tests')
-rw-r--r--tests/bind.expect24
-rw-r--r--tests/bind.expect.out1
2 files changed, 18 insertions, 7 deletions
diff --git a/tests/bind.expect b/tests/bind.expect
index 15557163..f8caa166 100644
--- a/tests/bind.expect
+++ b/tests/bind.expect
@@ -8,18 +8,27 @@ expect_prompt
send "set -g fish_key_bindings fish_vi_key_bindings\r"
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 "\033"
# Delay needed to allow fish to transition to vi "normal" mode.
-sleep 0.510
+sleep 0.550
send "ddi"
send "echo success: default escape timeout\r"
expect_prompt -re {\r\nsuccess: default escape timeout\r\n} {
puts "vi replace line: default escape timeout"
-} -nounmatched -re {\r\nfail} {
- puts stderr "vi replace line fail: default escape timeout"
} 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
@@ -40,7 +49,7 @@ expect_prompt -re {\r\ndef abc\r\n} {
send "echo TEXT"
send "\033"
# Delay needed to allow fish to transition to vi "normal" mode.
-sleep 0.510
+sleep 0.550
send "hhrAi\r"
expect_prompt -re {\r\nTAXT\r\n} {
puts "vi mode replace: default escape timeout"
@@ -56,7 +65,7 @@ send "set -g fish_escape_delay_ms 100\r"
expect_prompt
send "echo fail: shortened escape timeout"
send "\033"
-sleep 0.110
+sleep 0.150
send "ddi"
send "echo success: shortened escape timeout\r"
expect_prompt -re {\r\nsuccess: shortened escape timeout\r\n} {
@@ -100,6 +109,7 @@ expect_prompt -re {\r\ndef abc\r\n} {
# the words.
send "set -g fish_escape_delay_ms 100\r"
expect_prompt
+
send "echo ghi jkl"
send "\033"
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.
send "echo mno pqr"
send "\033"
-sleep 0.110
+sleep 0.150
send "t\r"
expect_prompt -re {\r\nmno pqrt\r\n} {
puts "emacs transpose words: long escape delay"
diff --git a/tests/bind.expect.out b/tests/bind.expect.out
index f4682d2c..2bb2dfe0 100644
--- a/tests/bind.expect.out
+++ b/tests/bind.expect.out
@@ -1,3 +1,4 @@
+prime vi mode: default escape timeout
vi replace line: default escape timeout
vi transpose words: default escape timeout
vi mode replace: default escape timeout