beads/cmd/bd/flatten_embedded_test.go
matt wilkie f443df1f2a
fix: resolve CI failures from flock, version bump, and lint (#2981)
* fix: resolve CI failures from flock, version bump, and lint

Three categories of CI failure on main after the v1.0.0 release:

1. rules.go lint/format: Fix gofmt alignment, errcheck on tw.Flush(),
   gosec G304 (add nosec comment), gosec G306 (use 0o600 perms).

2. doctor_test.go version tracking: The 'slightly outdated version'
   test used 0.55.0 which now has a major version diff from 1.0.0,
   correctly triggering a warning. Update expected status to match.

3. Embedded Dolt concurrent tests: The exclusive flock from #2571
   causes concurrent bd processes to fail with 'one writer at a time'.
   Update 58 concurrent test files to tolerate this expected error
   while still failing on unexpected errors and panics.

Amp-Thread-ID: https://ampcode.com/threads/T-019d5386-b41e-7138-bc81-6ea331b80760
Co-authored-by: Amp <amp@ampcode.com>

* fix: concurrent test post-conditions tolerate flock contention

With exclusive flock (commit 543e1943), only some workers can acquire
the lock in concurrent tests. Update post-conditions in 5 tests to:
- Only verify side effects from workers that succeeded (r.err == nil)
- Require at least 1 worker succeeds (fail if all hit flock)
- Log success/failure counts for visibility
- Still verify correct behavior for successful operations

Tests fixed:
- TestEmbeddedCloseConcurrent: remove Fatalf on failures, skip total count check
- TestEmbeddedDeferConcurrent: only check deferred status for successful workers
- TestEmbeddedUndeferConcurrent: only check open status for successful workers
- TestEmbeddedReopenConcurrent: only check open status for successful workers
- TestEmbeddedPromoteCLIConcurrent: only check permanent for successful workers

Amp-Thread-ID: https://ampcode.com/threads/T-019d5386-b41e-7138-bc81-6ea331b80760
Co-authored-by: Amp <amp@ampcode.com>
Amp-Thread-ID: https://ampcode.com/threads/T-019d5386-b41e-7138-bc81-6ea331b80760
Co-authored-by: Amp <amp@ampcode.com>

---------

Co-authored-by: Amp <amp@ampcode.com>
2026-04-03 07:27:00 -07:00

172 lines
5.2 KiB
Go

//go:build cgo
package main
import (
"fmt"
"os"
"os/exec"
"strings"
"sync"
"testing"
)
// bdFlatten runs "bd flatten" with the given args and returns stdout.
func bdFlatten(t *testing.T, bd, dir string, args ...string) string {
t.Helper()
fullArgs := append([]string{"flatten"}, args...)
cmd := exec.Command(bd, fullArgs...)
cmd.Dir = dir
cmd.Env = bdEnv(dir)
out, err := cmd.CombinedOutput()
if err != nil {
t.Fatalf("bd flatten %s failed: %v\n%s", strings.Join(args, " "), err, out)
}
return string(out)
}
// bdFlattenFail runs "bd flatten" expecting failure.
func bdFlattenFail(t *testing.T, bd, dir string, args ...string) string {
t.Helper()
fullArgs := append([]string{"flatten"}, args...)
cmd := exec.Command(bd, fullArgs...)
cmd.Dir = dir
cmd.Env = bdEnv(dir)
out, err := cmd.CombinedOutput()
if err == nil {
t.Fatalf("expected bd flatten %s to fail, but succeeded:\n%s", strings.Join(args, " "), out)
}
return string(out)
}
func TestEmbeddedFlatten(t *testing.T) {
if os.Getenv("BEADS_TEST_EMBEDDED_DOLT") != "1" {
t.Skip("set BEADS_TEST_EMBEDDED_DOLT=1 to run embedded dolt integration tests")
}
t.Parallel()
bd := buildEmbeddedBD(t)
// ===== Dry Run =====
t.Run("flatten_dry_run", func(t *testing.T) {
dir, _, _ := bdInit(t, bd, "--prefix", "fd")
// Create issues to generate commits
bdCreate(t, bd, dir, "Flatten dry-run issue 1", "--type", "task")
bdCreate(t, bd, dir, "Flatten dry-run issue 2", "--type", "task")
out := bdFlatten(t, bd, dir, "--dry-run")
if !strings.Contains(out, "Commits") || !strings.Contains(out, "DRY RUN") {
t.Errorf("expected commit count and DRY RUN in output: %s", out)
}
})
// ===== Already Flat =====
t.Run("flatten_fresh_db", func(t *testing.T) {
dir, _, _ := bdInit(t, bd, "--prefix", "fa")
// Fresh init may have 1 or more commits depending on schema setup.
// Either "Already flat" or successful flatten is fine.
out := bdFlatten(t, bd, dir, "--force")
if !strings.Contains(out, "Already flat") && !strings.Contains(out, "Flattened") && !strings.Contains(out, "already flat") {
t.Errorf("expected 'Already flat' or 'Flattened' message: %s", out)
}
})
// ===== No --force Errors =====
// Note: In embedded mode, store.Log() may return 0 entries even when
// Dolt commits exist, causing flatten to always report "Already flat".
// These tests skip when that happens rather than failing.
t.Run("flatten_no_force", func(t *testing.T) {
dir, _, _ := bdInit(t, bd, "--prefix", "fn")
bdCreate(t, bd, dir, "Flatten no-force 1", "--type", "task")
bdCreate(t, bd, dir, "Flatten no-force 2", "--type", "task")
dryOut := bdFlatten(t, bd, dir, "--dry-run")
if strings.Contains(dryOut, "Already flat") || strings.Contains(dryOut, "Commits: 0") {
t.Skip("store.Log() returns 0 commits in embedded mode — flatten guard untestable")
}
bdFlattenFail(t, bd, dir)
})
// ===== Force =====
t.Run("flatten_force", func(t *testing.T) {
dir, _, _ := bdInit(t, bd, "--prefix", "ff")
bdCreate(t, bd, dir, "Flatten force 1", "--type", "task")
bdCreate(t, bd, dir, "Flatten force 2", "--type", "task")
bdCreate(t, bd, dir, "Flatten force 3", "--type", "task")
dryOut := bdFlatten(t, bd, dir, "--dry-run")
if strings.Contains(dryOut, "Already flat") || strings.Contains(dryOut, "Commits: 0") {
t.Skip("store.Log() returns 0 commits in embedded mode — flatten untestable")
}
out := bdFlatten(t, bd, dir, "--force")
if !strings.Contains(out, "Flattened") {
t.Errorf("expected 'Flattened' in output: %s", out)
}
// Verify only 1 commit remains
dryOut = bdFlatten(t, bd, dir, "--dry-run")
if !strings.Contains(dryOut, "Already flat") && !strings.Contains(dryOut, "1") {
t.Errorf("expected 1 commit after flatten: %s", dryOut)
}
// Verify issues still exist after flatten
cmd := exec.Command(bd, "count")
cmd.Dir = dir
cmd.Env = bdEnv(dir)
countOut, err := cmd.CombinedOutput()
if err != nil {
t.Fatalf("bd count after flatten failed: %v\n%s", err, countOut)
}
if strings.Contains(string(countOut), ": 0") {
t.Errorf("expected issues to survive flatten: %s", countOut)
}
})
}
// TestEmbeddedFlattenConcurrent exercises flatten --dry-run concurrently.
func TestEmbeddedFlattenConcurrent(t *testing.T) {
if os.Getenv("BEADS_TEST_EMBEDDED_DOLT") != "1" {
t.Skip("set BEADS_TEST_EMBEDDED_DOLT=1 to run embedded dolt integration tests")
}
t.Parallel()
bd := buildEmbeddedBD(t)
dir, _, _ := bdInit(t, bd, "--prefix", "fx")
bdCreate(t, bd, dir, "Flatten concurrent issue", "--type", "task")
const numWorkers = 8
type workerResult struct {
worker int
err error
}
results := make([]workerResult, numWorkers)
var wg sync.WaitGroup
wg.Add(numWorkers)
for w := 0; w < numWorkers; w++ {
go func(worker int) {
defer wg.Done()
r := workerResult{worker: worker}
cmd := exec.Command(bd, "flatten", "--dry-run")
cmd.Dir = dir
cmd.Env = bdEnv(dir)
out, err := cmd.CombinedOutput()
if err != nil {
r.err = fmt.Errorf("flatten --dry-run (worker %d): %v\n%s", worker, err, out)
}
results[worker] = r
}(w)
}
wg.Wait()
for _, r := range results {
if r.err != nil && !strings.Contains(r.err.Error(), "one writer at a time") {
t.Errorf("worker %d failed: %v", r.worker, r.err)
}
}
}