extern/hishtory
1
0
Fork 0
mirror of https://github.com/ddworken/hishtory.git synced 2025-06-13 00:26:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add extra delay before adding token that makes it an invalid search query to make the race condition less likely

Browse Source
This commit is contained in:
David Dworken 2023-09-08 09:53:39 -07:00
parent 294bf78d25
commit 37c06a31db
No known key found for this signature in database
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
client/client_test.go
View File

@ -1940,9 +1940,9 @@ func testTui_search(t testing.TB) {
testutils.CompareGoldens(t, out, "TestTui-InitialInvalidSearch") testutils.CompareGoldens(t, out, "TestTui-InitialInvalidSearch")
// Check the output when the search is invalid // Check the output when the search is invalid
out = captureTerminalOutput(t, tester, []string{ out = captureTerminalOutputWithComplexCommands(t, tester, []TmuxCommand{
"hishtory SPACE tquery ENTER", {Keys: "hishtory SPACE tquery ENTER"},
"ls", ":", {Keys: "ls", ExtraDelay: 1.0}, {Keys: ":"},
}) })
out = strings.TrimSpace(strings.Split(out, "hishtory tquery")[1]) out = strings.TrimSpace(strings.Split(out, "hishtory tquery")[1])
testutils.CompareGoldens(t, out, "TestTui-InvalidSearch") testutils.CompareGoldens(t, out, "TestTui-InvalidSearch")
@ -2021,10 +2021,15 @@ func captureTerminalOutput(t testing.TB, tester shellTester, commands []string)
return captureTerminalOutputWithShellName(t, tester, tester.ShellName(), commands) return captureTerminalOutputWithShellName(t, tester, tester.ShellName(), commands)
} }
func captureTerminalOutputWithComplexCommands(t testing.TB, tester shellTester, commands []TmuxCommand) string {
return captureTerminalOutputWithShellNameAndDimensions(t, tester, tester.ShellName(), 200, 50, commands)
}
type TmuxCommand struct { type TmuxCommand struct {
Keys string Keys string
ResizeX int ResizeX int
ResizeY int ResizeY int
ExtraDelay float64
} }
func captureTerminalOutputWithShellName(t testing.TB, tester shellTester, overriddenShellName string, commands []string) string { func captureTerminalOutputWithShellName(t testing.TB, tester shellTester, overriddenShellName string, commands []string) string {
@ -2064,6 +2069,9 @@ func captureTerminalOutputWithShellNameAndDimensions(t testing.TB, tester shellT
if cmd.ResizeX != 0 && cmd.ResizeY != 0 { if cmd.ResizeX != 0 && cmd.ResizeY != 0 {
fullCommand += fmt.Sprintf(" tmux resize-window -t foo -x %d -y %d\n", cmd.ResizeX, cmd.ResizeY) fullCommand += fmt.Sprintf(" tmux resize-window -t foo -x %d -y %d\n", cmd.ResizeX, cmd.ResizeY)
} }
if cmd.ExtraDelay != 0 {
fullCommand += fmt.Sprintf(" sleep %f\n", cmd.ExtraDelay)
}
fullCommand += " sleep " + sleepAmount + "\n" fullCommand += " sleep " + sleepAmount + "\n"
} }
fullCommand += " sleep 2.5\n" fullCommand += " sleep 2.5\n"