Fixes #7349. The same race #7314 closed in internal/beads and
internal/config, in the fixtures it did not cover: a fixture's plain
`git commit` spawns the detached `git maintenance run --auto` child, whose
worktree-prune races the fixture's next `git worktree add` and deletes
.git/worktrees/<name>/locked under it (seen on PR #7312 run 37585997441,
cmd/bd Dolt-server tier shard 4/16, TestBootstrap_WorktreeFallbackDir).
One noAutoMaintenance + gitCommand(args...) helper per test package, each
in an existing untagged shared test file (cmd/bd/helpers_test.go,
doctor/git_test_helpers_test.go, doctor/fix/common_test.go,
formula/parser_test.go, git/gitdir_test.go, storage/domain/git/git_test.go;
cmd/bd/test_helpers_test.go is //go:build cgo so unusable for the pure
lane), and every inline exec.Command("git", ...) in those six packages
swapped for it. The flags ride the command line, never env config: the
routing-key scrub drops env config. No new files, so no BUILD.bazel rows.
Proof: GIT_TRACE on `go test ./cmd/bd -run TestBootstrap_WorktreeFallbackDir`
counts 3 `maintenance run --auto` spawns at d8d8bf587b and 0 with this
change.
Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
213 lines
5.7 KiB
Go
213 lines
5.7 KiB
Go
package main
|
|
|
|
import (
|
|
"os"
|
|
"path/filepath"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/steveyegge/beads/internal/beads"
|
|
"github.com/steveyegge/beads/internal/git"
|
|
)
|
|
|
|
func TestReset_WorktreeFindsBeadsDir(t *testing.T) {
|
|
tmpDir, err := os.MkdirTemp("", "beads-reset-worktree-test-*")
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
t.Cleanup(func() { os.RemoveAll(tmpDir) })
|
|
|
|
mainRepoDir := filepath.Join(tmpDir, "main-repo")
|
|
if err := os.MkdirAll(mainRepoDir, 0755); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
run := func(args ...string) {
|
|
cmd := gitCommand(args...)
|
|
cmd.Dir = mainRepoDir
|
|
if out, err := cmd.CombinedOutput(); err != nil {
|
|
t.Fatalf("git %v failed: %v\n%s", args, err, out)
|
|
}
|
|
}
|
|
|
|
run("init")
|
|
run("config", "user.email", "test@example.com")
|
|
run("config", "user.name", "Test User")
|
|
|
|
if err := os.WriteFile(filepath.Join(mainRepoDir, "README.md"), []byte("# Test\n"), 0644); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
run("add", "README.md")
|
|
run("commit", "-m", "Initial commit")
|
|
|
|
worktreeDir := filepath.Join(tmpDir, "worktree")
|
|
cmd := gitCommand("worktree", "add", worktreeDir, "HEAD")
|
|
cmd.Dir = mainRepoDir
|
|
if out, err := cmd.CombinedOutput(); err != nil {
|
|
t.Fatalf("git worktree add failed: %v\n%s", err, out)
|
|
}
|
|
t.Cleanup(func() {
|
|
cmd := gitCommand("worktree", "remove", "--force", worktreeDir)
|
|
cmd.Dir = mainRepoDir
|
|
_ = cmd.Run()
|
|
})
|
|
|
|
mainBeadsDir := filepath.Join(mainRepoDir, ".beads")
|
|
if err := os.MkdirAll(mainBeadsDir, 0755); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if err := os.WriteFile(filepath.Join(mainBeadsDir, "metadata.json"), []byte("{}"), 0644); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
worktreeBeadsDir := filepath.Join(worktreeDir, ".beads")
|
|
os.RemoveAll(worktreeBeadsDir)
|
|
|
|
t.Chdir(worktreeDir)
|
|
git.ResetCaches()
|
|
|
|
if !isGitRepo() {
|
|
t.Fatal("expected isGitRepo() to return true")
|
|
}
|
|
if !git.IsWorktree() {
|
|
t.Fatal("expected git.IsWorktree() to return true")
|
|
}
|
|
|
|
found := beads.FindBeadsDir()
|
|
if found == "" {
|
|
t.Fatal("FindBeadsDir() returned empty string")
|
|
}
|
|
|
|
expected, err := filepath.EvalSymlinks(mainBeadsDir)
|
|
if err != nil {
|
|
t.Fatalf("EvalSymlinks(%q) failed: %v", mainBeadsDir, err)
|
|
}
|
|
actual, err := filepath.EvalSymlinks(found)
|
|
if err != nil {
|
|
t.Fatalf("EvalSymlinks(%q) failed: %v", found, err)
|
|
}
|
|
|
|
expected = filepath.Clean(strings.TrimSpace(expected))
|
|
actual = filepath.Clean(strings.TrimSpace(actual))
|
|
|
|
if actual != expected {
|
|
t.Errorf("FindBeadsDir() = %q, want %q", actual, expected)
|
|
}
|
|
|
|
if _, err := os.Stat(actual); err != nil {
|
|
t.Errorf("os.Stat(FindBeadsDir()) failed: %v — runReset would report \"not initialized\"", err)
|
|
}
|
|
}
|
|
|
|
func TestReset_WorktreeNoBeadsReturnsEmpty(t *testing.T) {
|
|
tmpDir, err := os.MkdirTemp("", "beads-reset-no-beads-test-*")
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
t.Cleanup(func() { os.RemoveAll(tmpDir) })
|
|
|
|
mainRepoDir := filepath.Join(tmpDir, "main-repo")
|
|
if err := os.MkdirAll(mainRepoDir, 0755); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
run := func(args ...string) {
|
|
cmd := gitCommand(args...)
|
|
cmd.Dir = mainRepoDir
|
|
if out, err := cmd.CombinedOutput(); err != nil {
|
|
t.Fatalf("git %v failed: %v\n%s", args, err, out)
|
|
}
|
|
}
|
|
run("init")
|
|
run("config", "user.email", "test@example.com")
|
|
run("config", "user.name", "Test User")
|
|
if err := os.WriteFile(filepath.Join(mainRepoDir, "README.md"), []byte("# Test\n"), 0644); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
run("add", "README.md")
|
|
run("commit", "-m", "Initial commit")
|
|
|
|
worktreeDir := filepath.Join(tmpDir, "worktree")
|
|
cmd := gitCommand("worktree", "add", worktreeDir, "HEAD")
|
|
cmd.Dir = mainRepoDir
|
|
if out, err := cmd.CombinedOutput(); err != nil {
|
|
t.Fatalf("git worktree add failed: %v\n%s", err, out)
|
|
}
|
|
t.Cleanup(func() {
|
|
cmd := gitCommand("worktree", "remove", "--force", worktreeDir)
|
|
cmd.Dir = mainRepoDir
|
|
_ = cmd.Run()
|
|
})
|
|
|
|
t.Chdir(worktreeDir)
|
|
git.ResetCaches()
|
|
|
|
found := beads.FindBeadsDir()
|
|
if found != "" {
|
|
t.Errorf("FindBeadsDir() = %q, want empty string when no .beads exists anywhere", found)
|
|
}
|
|
}
|
|
|
|
func TestReset_WorktreeSubdirFindsBeadsDir(t *testing.T) {
|
|
tmpDir, err := os.MkdirTemp("", "beads-reset-subdir-test-*")
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
t.Cleanup(func() { os.RemoveAll(tmpDir) })
|
|
|
|
mainRepoDir := filepath.Join(tmpDir, "main-repo")
|
|
if err := os.MkdirAll(mainRepoDir, 0755); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
run := func(args ...string) {
|
|
cmd := gitCommand(args...)
|
|
cmd.Dir = mainRepoDir
|
|
if out, err := cmd.CombinedOutput(); err != nil {
|
|
t.Fatalf("git %v failed: %v\n%s", args, err, out)
|
|
}
|
|
}
|
|
run("init")
|
|
run("config", "user.email", "test@example.com")
|
|
run("config", "user.name", "Test User")
|
|
if err := os.WriteFile(filepath.Join(mainRepoDir, "README.md"), []byte("# Test\n"), 0644); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
run("add", "README.md")
|
|
run("commit", "-m", "Initial commit")
|
|
|
|
worktreeDir := filepath.Join(tmpDir, "worktree")
|
|
cmd := gitCommand("worktree", "add", worktreeDir, "HEAD")
|
|
cmd.Dir = mainRepoDir
|
|
if out, err := cmd.CombinedOutput(); err != nil {
|
|
t.Fatalf("git worktree add failed: %v\n%s", err, out)
|
|
}
|
|
t.Cleanup(func() {
|
|
cmd := gitCommand("worktree", "remove", "--force", worktreeDir)
|
|
cmd.Dir = mainRepoDir
|
|
_ = cmd.Run()
|
|
})
|
|
|
|
mainBeadsDir := filepath.Join(mainRepoDir, ".beads")
|
|
if err := os.MkdirAll(mainBeadsDir, 0755); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
os.RemoveAll(filepath.Join(worktreeDir, ".beads"))
|
|
|
|
subDir := filepath.Join(worktreeDir, "sub", "dir")
|
|
if err := os.MkdirAll(subDir, 0755); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
t.Chdir(subDir)
|
|
git.ResetCaches()
|
|
|
|
found := beads.FindBeadsDir()
|
|
if found != "" {
|
|
actual, _ := filepath.EvalSymlinks(found)
|
|
expected, _ := filepath.EvalSymlinks(mainBeadsDir)
|
|
if filepath.Clean(actual) != filepath.Clean(expected) {
|
|
t.Errorf("FindBeadsDir() from subdirectory = %q, want %q", actual, expected)
|
|
}
|
|
}
|
|
}
|