github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-25 09:39:52 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

tests/pexpect: Fix \d escape

Browse Source
This commit is contained in:
Fabian Boehm 2024-04-02 22:40:45 +02:00
parent 171869858a
commit 3af849d739
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/pexpects/history.py
View File

@ -65,7 +65,7 @@ expect_prompt("echo start2.*\r\necho start1")
# Verify searching with a request for timestamps includes the timestamps. # Verify searching with a request for timestamps includes the timestamps.
sendline("history search --show-time='# %F %T%n' --prefix 'echo start'") sendline("history search --show-time='# %F %T%n' --prefix 'echo start'")
expect_prompt( expect_prompt(
"# \d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d\r\necho start2; .*\r\n# \d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d\r\necho start1;" "# \\d\\d\\d\\d-\\d\\d-\\d\\d \\d\\d:\\d\\d:\\d\\d\r\necho start2; .*\r\n# \\d\\d\\d\\d-\\d\\d-\\d\\d \\d\\d:\\d\\d:\\d\\d\r\necho start1;"
) )
# ========== # ==========

2
tests/pexpects/job_summary.py
View File

@ -45,7 +45,7 @@ expect_re("Job.*Group.*(CPU)?.*State.*Command")
expect_re(".*running.*sleep 20 &") expect_re(".*running.*sleep 20 &")
expect_prompt() expect_prompt()
sendline("echo $my_pid") sendline("echo $my_pid")
m = expect_re("\d+\r\n") m = expect_re("\\d+\r\n")
expect_prompt() expect_prompt()
os.kill(int(m.group()), signal.SIGTERM) os.kill(int(m.group()), signal.SIGTERM)
expect_re("[0-9]+:0:sleep 20 &:SIGTERM:Polite quit request", timeout=20) expect_re("[0-9]+:0:sleep 20 &:SIGTERM:Polite quit request", timeout=20)

4
tests/pexpects/signals.py
View File

@ -83,10 +83,10 @@ expect_prompt()
# Save the pids for later to check if they are still running. # Save the pids for later to check if they are still running.
pids = [] pids = []
send("sleep 130 & echo $last_pid\r") send("sleep 130 & echo $last_pid\r")
pids += [expect_re("\d+\r\n").group().strip()] pids += [expect_re("\\d+\r\n").group().strip()]
expect_prompt() expect_prompt()
send("sleep 131 & echo $last_pid\r") send("sleep 131 & echo $last_pid\r")
pids += [expect_re("\d+\r\n").group().strip()] pids += [expect_re("\\d+\r\n").group().strip()]
expect_prompt() expect_prompt()
send("sleep 9999999\r") send("sleep 9999999\r")
sleep(0.500) # ensure fish kicks off the above sleep before it gets HUP - see #7288 sleep(0.500) # ensure fish kicks off the above sleep before it gets HUP - see #7288