mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-09-10 07:36:27 -04:00
59ed1517bc
The test harness enqueued ErrQuit after a test finished, waited for the program to go idle, then slept a fixed second and declared "gocui should have already exited" if it hadn't. That fixed grace is fragile: under the race detector the shutdown legitimately takes longer than a second, so nearly every test failed with that message even though nothing was wrong. Wait for the main loop to actually return instead. gocui now closes a loopExited channel when MainLoop exits, and the harness blocks on it; the existing 40s watchdog still fails a test whose loop genuinely never quits. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
59 lines
1.3 KiB
Go
59 lines
1.3 KiB
Go
package gui
|
|
|
|
import (
|
|
"log"
|
|
"os"
|
|
"time"
|
|
|
|
"github.com/jesseduffield/lazygit/pkg/gocui"
|
|
"github.com/jesseduffield/lazygit/pkg/gui/popup"
|
|
"github.com/jesseduffield/lazygit/pkg/gui/types"
|
|
"github.com/jesseduffield/lazygit/pkg/integration/components"
|
|
"github.com/jesseduffield/lazygit/pkg/utils"
|
|
)
|
|
|
|
type IntegrationTest interface {
|
|
Run(*GuiDriver)
|
|
}
|
|
|
|
func (gui *Gui) handleTestMode() {
|
|
test := gui.integrationTest
|
|
if os.Getenv(components.SANDBOX_ENV_VAR) == "true" {
|
|
return
|
|
}
|
|
|
|
if test != nil {
|
|
waitUntilIdle := func() {
|
|
gui.c.GocuiGui().WaitUntilIdle()
|
|
}
|
|
|
|
go func() {
|
|
waitUntilIdle()
|
|
|
|
toastChan := make(chan string, 100)
|
|
gui.PopupHandler.(*popup.PopupHandler).SetToastFunc(
|
|
func(message string, kind types.ToastKind) { toastChan <- message })
|
|
|
|
test.Run(&GuiDriver{gui: gui, toastChan: toastChan, headless: Headless()})
|
|
|
|
gui.g.Update(func(*gocui.Gui) error {
|
|
return gocui.ErrQuit
|
|
})
|
|
|
|
// Wait for the event loop to actually exit.
|
|
<-gui.g.LoopExited()
|
|
}()
|
|
|
|
if os.Getenv(components.WAIT_FOR_DEBUGGER_ENV_VAR) == "" {
|
|
go utils.Safe(func() {
|
|
time.Sleep(time.Second * 40)
|
|
log.Fatal("40 seconds is up, lazygit recording took too long to complete")
|
|
})
|
|
}
|
|
}
|
|
}
|
|
|
|
func Headless() bool {
|
|
return os.Getenv("LAZYGIT_HEADLESS") != ""
|
|
}
|