Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions internal/daemon/merge_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,11 @@ target_branch: %s

runner := newTestRunner(dir, filepath.Join(dir, "omp"), filepath.Join(dir, "logs"), 1)
runner.cfg.ObsidianVault = vault
// Merge completion can launch an async knowledge-extraction goroutine
// that writes under the fixture vault. Wait for it before TempDir
// cleanup, otherwise the cleanup races the write and flakes with
// "directory not empty" (Go 1.26 TempDir numbered subdirectories).
t.Cleanup(func() { waitForTasksIdle(t, runner) })
return &mergeFixture{
repo: repo,
worktree: worktree,
Expand Down