h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-05-31 20:31:19 -03:00
Code Issues Packages Projects Releases Wiki Activity

Tests: Increase timeouts even more in CI

Browse Source 
Have I ever mentioned I hate this?
This commit is contained in:
Fabian Homborg
2021-07-12 18:45:46 +02:00
parent e212064978
commit 7789651b8a
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/pexpects/bind_mode_events.py
View File

@@ -41,14 +41,18 @@ expect_prompt("\r\nmode changes: default insert default insert\r\n")
send("set -e MODE_CHANGES\r") send("set -e MODE_CHANGES\r")
expect_prompt() expect_prompt()
timeout = 0.15
if "CI" in os.environ:
timeout = 1.0
# Put some text on the command line and then go back to normal mode. # Put some text on the command line and then go back to normal mode.
send("echo stuff") send("echo stuff")
sp.expect_str("echo stuff") sp.expect_str("echo stuff")
send("\033") send("\033")
sleep(0.150) sleep(timeout)
os.kill(sp.spawn.pid, signal.SIGINT) os.kill(sp.spawn.pid, signal.SIGINT)
sleep(0.150) sleep(timeout)
# We should be back in insert mode now. # We should be back in insert mode now.
send("echo mode changes: $MODE_CHANGES\r") send("echo mode changes: $MODE_CHANGES\r")

8
tests/pexpects/cancel_event.py
View File

@@ -13,9 +13,13 @@ send, sendline, sleep, expect_str, expect_prompt = (
) )
expect_prompt() expect_prompt()
timeout = 0.15
if "CI" in os.environ:
timeout = 1.0
# Verify that cancel-commandline does what we expect - see #7384. # Verify that cancel-commandline does what we expect - see #7384.
send("not executed") send("not executed")
sleep(0.15) sleep(timeout)
os.kill(sp.spawn.pid, signal.SIGINT) os.kill(sp.spawn.pid, signal.SIGINT)
sp.expect_str("not executed^C") sp.expect_str("not executed^C")
expect_prompt(increment=False) expect_prompt(increment=False)
@@ -23,7 +27,7 @@ expect_prompt(increment=False)
sendline("function cancelhandler --on-event fish_cancel ; echo yay cancelled ; end") sendline("function cancelhandler --on-event fish_cancel ; echo yay cancelled ; end")
expect_prompt() expect_prompt()
send("still not executed") send("still not executed")
sleep(0.15) sleep(timeout)
os.kill(sp.spawn.pid, signal.SIGINT) os.kill(sp.spawn.pid, signal.SIGINT)
expect_str("still not executed^C") expect_str("still not executed^C")
expect_prompt("yay cancelled", increment=False) expect_prompt("yay cancelled", increment=False)