Fixes nested workspace detection and symlink path issues in workspace.Find() - Remove filepath.EvalSymlinks() for consistency with os.Getwd() - Add isInWorktreePath() to detect polecats/crew directories - Continue walking up to outermost workspace when in worktree paths - Add integration tests for symlink and nested workspace scenarios
This commit is contained in:
@@ -143,8 +143,7 @@ func TestIsWorkspace(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestFindFollowsSymlinks(t *testing.T) {
|
||||
// Create workspace
|
||||
func TestFindFromSymlinkedDir(t *testing.T) {
|
||||
root := realPath(t, t.TempDir())
|
||||
mayorDir := filepath.Join(root, "mayor")
|
||||
if err := os.MkdirAll(mayorDir, 0755); err != nil {
|
||||
@@ -155,7 +154,6 @@ func TestFindFollowsSymlinks(t *testing.T) {
|
||||
t.Fatalf("write: %v", err)
|
||||
}
|
||||
|
||||
// Create a symlinked directory
|
||||
linkTarget := filepath.Join(root, "actual")
|
||||
if err := os.MkdirAll(linkTarget, 0755); err != nil {
|
||||
t.Fatalf("mkdir: %v", err)
|
||||
@@ -166,7 +164,6 @@ func TestFindFollowsSymlinks(t *testing.T) {
|
||||
t.Skipf("symlink not supported: %v", err)
|
||||
}
|
||||
|
||||
// Find from symlinked dir should work
|
||||
found, err := Find(linkName)
|
||||
if err != nil {
|
||||
t.Fatalf("Find: %v", err)
|
||||
@@ -175,3 +172,109 @@ func TestFindFollowsSymlinks(t *testing.T) {
|
||||
t.Errorf("Find = %q, want %q", found, root)
|
||||
}
|
||||
}
|
||||
|
||||
func TestFindPreservesSymlinkPath(t *testing.T) {
|
||||
realRoot := t.TempDir()
|
||||
resolved, err := filepath.EvalSymlinks(realRoot)
|
||||
if err != nil {
|
||||
t.Fatalf("EvalSymlinks: %v", err)
|
||||
}
|
||||
|
||||
symRoot := filepath.Join(t.TempDir(), "symlink-workspace")
|
||||
if err := os.Symlink(resolved, symRoot); err != nil {
|
||||
t.Skipf("symlink not supported: %v", err)
|
||||
}
|
||||
|
||||
mayorDir := filepath.Join(symRoot, "mayor")
|
||||
if err := os.MkdirAll(mayorDir, 0755); err != nil {
|
||||
t.Fatalf("mkdir: %v", err)
|
||||
}
|
||||
townFile := filepath.Join(mayorDir, "town.json")
|
||||
if err := os.WriteFile(townFile, []byte(`{}`), 0644); err != nil {
|
||||
t.Fatalf("write: %v", err)
|
||||
}
|
||||
|
||||
subdir := filepath.Join(symRoot, "rigs", "project", "polecats", "worker")
|
||||
if err := os.MkdirAll(subdir, 0755); err != nil {
|
||||
t.Fatalf("mkdir: %v", err)
|
||||
}
|
||||
|
||||
townRoot, err := Find(subdir)
|
||||
if err != nil {
|
||||
t.Fatalf("Find: %v", err)
|
||||
}
|
||||
|
||||
if townRoot != symRoot {
|
||||
t.Errorf("Find returned %q, want %q (symlink path preserved)", townRoot, symRoot)
|
||||
}
|
||||
|
||||
relPath, err := filepath.Rel(townRoot, subdir)
|
||||
if err != nil {
|
||||
t.Fatalf("Rel: %v", err)
|
||||
}
|
||||
|
||||
if relPath != "rigs/project/polecats/worker" {
|
||||
t.Errorf("Rel = %q, want 'rigs/project/polecats/worker'", relPath)
|
||||
}
|
||||
}
|
||||
|
||||
func TestFindSkipsNestedWorkspaceInWorktree(t *testing.T) {
|
||||
root := realPath(t, t.TempDir())
|
||||
|
||||
if err := os.MkdirAll(filepath.Join(root, "mayor"), 0755); err != nil {
|
||||
t.Fatalf("mkdir: %v", err)
|
||||
}
|
||||
if err := os.WriteFile(filepath.Join(root, "mayor", "town.json"), []byte(`{"name":"outer"}`), 0644); err != nil {
|
||||
t.Fatalf("write: %v", err)
|
||||
}
|
||||
|
||||
polecatDir := filepath.Join(root, "myrig", "polecats", "worker")
|
||||
if err := os.MkdirAll(filepath.Join(polecatDir, "mayor"), 0755); err != nil {
|
||||
t.Fatalf("mkdir: %v", err)
|
||||
}
|
||||
if err := os.WriteFile(filepath.Join(polecatDir, "mayor", "town.json"), []byte(`{"name":"inner"}`), 0644); err != nil {
|
||||
t.Fatalf("write: %v", err)
|
||||
}
|
||||
|
||||
found, err := Find(polecatDir)
|
||||
if err != nil {
|
||||
t.Fatalf("Find: %v", err)
|
||||
}
|
||||
|
||||
if found != root {
|
||||
t.Errorf("Find = %q, want %q (should skip nested workspace in polecats/)", found, root)
|
||||
}
|
||||
|
||||
rel, _ := filepath.Rel(found, polecatDir)
|
||||
if rel != "myrig/polecats/worker" {
|
||||
t.Errorf("Rel = %q, want 'myrig/polecats/worker'", rel)
|
||||
}
|
||||
}
|
||||
|
||||
func TestFindSkipsNestedWorkspaceInCrew(t *testing.T) {
|
||||
root := realPath(t, t.TempDir())
|
||||
|
||||
if err := os.MkdirAll(filepath.Join(root, "mayor"), 0755); err != nil {
|
||||
t.Fatalf("mkdir: %v", err)
|
||||
}
|
||||
if err := os.WriteFile(filepath.Join(root, "mayor", "town.json"), []byte(`{"name":"outer"}`), 0644); err != nil {
|
||||
t.Fatalf("write: %v", err)
|
||||
}
|
||||
|
||||
crewDir := filepath.Join(root, "myrig", "crew", "worker")
|
||||
if err := os.MkdirAll(filepath.Join(crewDir, "mayor"), 0755); err != nil {
|
||||
t.Fatalf("mkdir: %v", err)
|
||||
}
|
||||
if err := os.WriteFile(filepath.Join(crewDir, "mayor", "town.json"), []byte(`{"name":"inner"}`), 0644); err != nil {
|
||||
t.Fatalf("write: %v", err)
|
||||
}
|
||||
|
||||
found, err := Find(crewDir)
|
||||
if err != nil {
|
||||
t.Fatalf("Find: %v", err)
|
||||
}
|
||||
|
||||
if found != root {
|
||||
t.Errorf("Find = %q, want %q (should skip nested workspace in crew/)", found, root)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user