diff --git a/cmd/bd/dolt_test.go b/cmd/bd/dolt_test.go index 3b129a19a..c5203fc48 100644 --- a/cmd/bd/dolt_test.go +++ b/cmd/bd/dolt_test.go @@ -55,6 +55,10 @@ func TestDoltShowConfigEmbeddedMode(t *testing.T) { t.Fatalf("failed to save config: %v", err) } + // Override BEADS_DIR so FindBeadsDir() returns our temp .beads, + // not the rig's .beads (which happens in worktree environments). + t.Setenv("BEADS_DIR", beadsDir) + oldCwd, _ := os.Getwd() if err := os.Chdir(tmpDir); err != nil { t.Fatalf("failed to chdir: %v", err) @@ -127,6 +131,10 @@ func TestDoltShowConfigServerMode(t *testing.T) { t.Fatalf("failed to save config: %v", err) } + // Override BEADS_DIR so FindBeadsDir() returns our temp .beads, + // not the rig's .beads (which happens in worktree environments). + t.Setenv("BEADS_DIR", beadsDir) + oldCwd, _ := os.Getwd() if err := os.Chdir(tmpDir); err != nil { t.Fatalf("failed to chdir: %v", err) @@ -205,6 +213,12 @@ func TestDoltSetConfigValidation(t *testing.T) { t.Fatalf("failed to save config: %v", err) } + // Override BEADS_DIR so FindBeadsDir() returns our temp .beads, + // not the rig's .beads (which happens in worktree environments). + // Without this, setDoltConfig writes test values to the production + // metadata.json, corrupting the Dolt server connection config. + t.Setenv("BEADS_DIR", beadsDir) + oldCwd, _ := os.Getwd() if err := os.Chdir(tmpDir); err != nil { t.Fatalf("failed to chdir: %v", err) @@ -303,6 +317,10 @@ func TestDoltSetConfigJSONOutput(t *testing.T) { t.Fatalf("failed to save config: %v", err) } + // Override BEADS_DIR so FindBeadsDir() returns our temp .beads, + // not the rig's .beads (which happens in worktree environments). + t.Setenv("BEADS_DIR", beadsDir) + oldCwd, _ := os.Getwd() if err := os.Chdir(tmpDir); err != nil { t.Fatalf("failed to chdir: %v", err) @@ -354,6 +372,10 @@ func TestDoltSetConfigWithUpdateConfig(t *testing.T) { t.Fatalf("failed to create config.yaml: %v", err) } + // Override BEADS_DIR so FindBeadsDir() returns our temp .beads, + // not the rig's .beads (which happens in worktree environments). + t.Setenv("BEADS_DIR", beadsDir) + oldCwd, _ := os.Getwd() if err := os.Chdir(tmpDir); err != nil { t.Fatalf("failed to chdir: %v", err)