* 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>
196 lines
5.5 KiB
Go
196 lines
5.5 KiB
Go
//go:build cgo
|
|
|
|
package main
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
"os/exec"
|
|
"strings"
|
|
"sync"
|
|
"testing"
|
|
)
|
|
|
|
// bdGC runs "bd gc" with the given args and returns stdout.
|
|
func bdGC(t *testing.T, bd, dir string, args ...string) string {
|
|
t.Helper()
|
|
fullArgs := append([]string{"gc"}, args...)
|
|
cmd := exec.Command(bd, fullArgs...)
|
|
cmd.Dir = dir
|
|
cmd.Env = bdEnv(dir)
|
|
out, err := cmd.CombinedOutput()
|
|
if err != nil {
|
|
t.Fatalf("bd gc %s failed: %v\n%s", strings.Join(args, " "), err, out)
|
|
}
|
|
return string(out)
|
|
}
|
|
|
|
// bdGCFail runs "bd gc" expecting failure.
|
|
func bdGCFail(t *testing.T, bd, dir string, args ...string) string {
|
|
t.Helper()
|
|
fullArgs := append([]string{"gc"}, args...)
|
|
cmd := exec.Command(bd, fullArgs...)
|
|
cmd.Dir = dir
|
|
cmd.Env = bdEnv(dir)
|
|
out, err := cmd.CombinedOutput()
|
|
if err == nil {
|
|
t.Fatalf("expected bd gc %s to fail, but succeeded:\n%s", strings.Join(args, " "), out)
|
|
}
|
|
return string(out)
|
|
}
|
|
|
|
func TestEmbeddedGC(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", "tg")
|
|
|
|
// Create some issues for gc to work with
|
|
for i := 0; i < 3; i++ {
|
|
bdCreate(t, bd, dir, fmt.Sprintf("GC test issue %d", i), "--type", "task")
|
|
}
|
|
|
|
// ===== Dry Run =====
|
|
|
|
t.Run("gc_dry_run", func(t *testing.T) {
|
|
out := bdGC(t, bd, dir, "--dry-run")
|
|
if !strings.Contains(out, "Phase 1/3") {
|
|
t.Errorf("expected 'Phase 1/3' in dry-run output: %s", out)
|
|
}
|
|
if !strings.Contains(out, "DRY RUN") {
|
|
t.Errorf("expected 'DRY RUN' in output: %s", out)
|
|
}
|
|
})
|
|
|
|
// ===== Skip Flags =====
|
|
|
|
t.Run("gc_skip_decay", func(t *testing.T) {
|
|
out := bdGC(t, bd, dir, "--dry-run", "--skip-decay")
|
|
if !strings.Contains(out, "skipped") {
|
|
t.Errorf("expected 'skipped' for decay phase: %s", out)
|
|
}
|
|
})
|
|
|
|
t.Run("gc_skip_dolt", func(t *testing.T) {
|
|
out := bdGC(t, bd, dir, "--dry-run", "--skip-dolt")
|
|
if !strings.Contains(out, "skipped") {
|
|
t.Errorf("expected 'skipped' for dolt gc phase: %s", out)
|
|
}
|
|
})
|
|
|
|
t.Run("gc_skip_both", func(t *testing.T) {
|
|
out := bdGC(t, bd, dir, "--dry-run", "--skip-decay", "--skip-dolt")
|
|
if !strings.Contains(out, "DRY RUN") {
|
|
t.Errorf("expected 'DRY RUN' in output: %s", out)
|
|
}
|
|
})
|
|
|
|
// ===== Older Than =====
|
|
|
|
t.Run("gc_older_than", func(t *testing.T) {
|
|
out := bdGC(t, bd, dir, "--dry-run", "--older-than", "0")
|
|
// With --older-than 0, all closed issues would be candidates
|
|
if !strings.Contains(out, "Phase 1/3") {
|
|
t.Errorf("expected phase output: %s", out)
|
|
}
|
|
})
|
|
|
|
// ===== Force with Decay =====
|
|
|
|
t.Run("gc_force_with_decay", func(t *testing.T) {
|
|
gcDir, _, _ := bdInit(t, bd, "--prefix", "gf")
|
|
|
|
// Create and close issues (non-ephemeral tasks)
|
|
for i := 0; i < 3; i++ {
|
|
issue := bdCreate(t, bd, gcDir, fmt.Sprintf("GC decay %d", i), "--type", "task")
|
|
cmd := exec.Command(bd, "close", issue.ID)
|
|
cmd.Dir = gcDir
|
|
cmd.Env = bdEnv(gcDir)
|
|
if out, err := cmd.CombinedOutput(); err != nil {
|
|
t.Fatalf("close %s failed: %v\n%s", issue.ID, err, out)
|
|
}
|
|
}
|
|
|
|
// GC with force and older-than 0 (all closed issues eligible)
|
|
// --skip-dolt to avoid slow GC in tests
|
|
out := bdGC(t, bd, gcDir, "--force", "--older-than", "0", "--skip-dolt")
|
|
if !strings.Contains(out, "Deleted") && !strings.Contains(out, "deleted") {
|
|
// If no issues match (e.g., closed_at is too recent for the filter),
|
|
// at minimum verify the command completed.
|
|
if !strings.Contains(out, "GC complete") && !strings.Contains(out, "Phase") {
|
|
t.Errorf("expected gc output: %s", out)
|
|
}
|
|
}
|
|
})
|
|
|
|
// ===== No --force prompts =====
|
|
|
|
t.Run("gc_no_force_prompts", func(t *testing.T) {
|
|
gcDir, _, _ := bdInit(t, bd, "--prefix", "gn")
|
|
issue := bdCreate(t, bd, gcDir, "GC no force", "--type", "task")
|
|
cmd := exec.Command(bd, "close", issue.ID)
|
|
cmd.Dir = gcDir
|
|
cmd.Env = bdEnv(gcDir)
|
|
if out, err := cmd.CombinedOutput(); err != nil {
|
|
t.Fatalf("close failed: %v\n%s", err, out)
|
|
}
|
|
|
|
// Without --force but with closed issues, should fail with hint.
|
|
// If no closed issues match the age filter, it may succeed (0 candidates).
|
|
cmd = exec.Command(bd, "gc", "--older-than", "0")
|
|
cmd.Dir = gcDir
|
|
cmd.Env = bdEnv(gcDir)
|
|
out, err := cmd.CombinedOutput()
|
|
// Either fails (prompt for --force) or succeeds (no matching issues) — both OK
|
|
_ = err
|
|
_ = out
|
|
})
|
|
}
|
|
|
|
// TestEmbeddedGCConcurrent exercises gc --dry-run concurrently.
|
|
func TestEmbeddedGCConcurrent(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", "gx")
|
|
|
|
for i := 0; i < 3; i++ {
|
|
bdCreate(t, bd, dir, fmt.Sprintf("gc-concurrent-%d", i), "--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, "gc", "--dry-run")
|
|
cmd.Dir = dir
|
|
cmd.Env = bdEnv(dir)
|
|
out, err := cmd.CombinedOutput()
|
|
if err != nil {
|
|
r.err = fmt.Errorf("gc --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)
|
|
}
|
|
}
|
|
}
|