* 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>
176 lines
4.7 KiB
Go
176 lines
4.7 KiB
Go
//go:build cgo
|
|
|
|
package main
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
"os/exec"
|
|
"strings"
|
|
"sync"
|
|
"testing"
|
|
)
|
|
|
|
// bdPurge runs "bd purge" with the given args and returns stdout.
|
|
func bdPurge(t *testing.T, bd, dir string, args ...string) string {
|
|
t.Helper()
|
|
fullArgs := append([]string{"purge"}, args...)
|
|
cmd := exec.Command(bd, fullArgs...)
|
|
cmd.Dir = dir
|
|
cmd.Env = bdEnv(dir)
|
|
out, err := cmd.CombinedOutput()
|
|
if err != nil {
|
|
t.Fatalf("bd purge %s failed: %v\n%s", strings.Join(args, " "), err, out)
|
|
}
|
|
return string(out)
|
|
}
|
|
|
|
// bdPurgeFail runs "bd purge" expecting failure.
|
|
func bdPurgeFail(t *testing.T, bd, dir string, args ...string) string {
|
|
t.Helper()
|
|
fullArgs := append([]string{"purge"}, args...)
|
|
cmd := exec.Command(bd, fullArgs...)
|
|
cmd.Dir = dir
|
|
cmd.Env = bdEnv(dir)
|
|
out, err := cmd.CombinedOutput()
|
|
if err == nil {
|
|
t.Fatalf("expected bd purge %s to fail, but succeeded:\n%s", strings.Join(args, " "), out)
|
|
}
|
|
return string(out)
|
|
}
|
|
|
|
// createAndCloseEphemeral creates an ephemeral issue and closes it.
|
|
func createAndCloseEphemeral(t *testing.T, bd, dir, title string) string {
|
|
t.Helper()
|
|
issue := bdCreate(t, bd, dir, title, "--ephemeral")
|
|
cmd := exec.Command(bd, "close", issue.ID)
|
|
cmd.Dir = dir
|
|
cmd.Env = bdEnv(dir)
|
|
if out, err := cmd.CombinedOutput(); err != nil {
|
|
t.Fatalf("close %s failed: %v\n%s", issue.ID, err, out)
|
|
}
|
|
return issue.ID
|
|
}
|
|
|
|
func TestEmbeddedPurge(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)
|
|
|
|
// ===== Nothing to Purge =====
|
|
|
|
t.Run("purge_nothing", func(t *testing.T) {
|
|
dir, _, _ := bdInit(t, bd, "--prefix", "pn")
|
|
// No ephemeral issues — preview should show nothing
|
|
cmd := exec.Command(bd, "purge")
|
|
cmd.Dir = dir
|
|
cmd.Env = bdEnv(dir)
|
|
out, _ := cmd.CombinedOutput()
|
|
_ = out // Should not crash, regardless of exit code
|
|
})
|
|
|
|
// ===== Preview (no flags) =====
|
|
|
|
t.Run("purge_preview", func(t *testing.T) {
|
|
dir, _, _ := bdInit(t, bd, "--prefix", "pp")
|
|
createAndCloseEphemeral(t, bd, dir, "Purge preview 1")
|
|
createAndCloseEphemeral(t, bd, dir, "Purge preview 2")
|
|
|
|
// Without --force, should show preview and fail
|
|
bdPurgeFail(t, bd, dir)
|
|
})
|
|
|
|
// ===== Dry Run =====
|
|
|
|
t.Run("purge_dry_run", func(t *testing.T) {
|
|
dir, _, _ := bdInit(t, bd, "--prefix", "pd")
|
|
createAndCloseEphemeral(t, bd, dir, "Purge dry-run 1")
|
|
|
|
out := bdPurge(t, bd, dir, "--dry-run")
|
|
if len(strings.TrimSpace(out)) == 0 {
|
|
t.Error("expected non-empty dry-run output")
|
|
}
|
|
})
|
|
|
|
// ===== Force =====
|
|
|
|
t.Run("purge_force", func(t *testing.T) {
|
|
dir, _, _ := bdInit(t, bd, "--prefix", "pf")
|
|
createAndCloseEphemeral(t, bd, dir, "Purge force 1")
|
|
createAndCloseEphemeral(t, bd, dir, "Purge force 2")
|
|
|
|
out := bdPurge(t, bd, dir, "--force")
|
|
if !strings.Contains(out, "Purged") {
|
|
t.Errorf("expected 'Purged' in output: %s", out)
|
|
}
|
|
})
|
|
|
|
// ===== Older Than =====
|
|
|
|
t.Run("purge_older_than", func(t *testing.T) {
|
|
dir, _, _ := bdInit(t, bd, "--prefix", "po")
|
|
createAndCloseEphemeral(t, bd, dir, "Purge older-than 1")
|
|
|
|
// --older-than 1d means closed more than 1 day ago
|
|
out := bdPurge(t, bd, dir, "--older-than", "1d", "--force")
|
|
_ = out // Should succeed (may find 0 matches since just closed)
|
|
})
|
|
|
|
// ===== Pattern =====
|
|
|
|
t.Run("purge_pattern", func(t *testing.T) {
|
|
dir, _, _ := bdInit(t, bd, "--prefix", "pt")
|
|
createAndCloseEphemeral(t, bd, dir, "Purge pattern test")
|
|
|
|
// Pattern matching — use prefix wildcard
|
|
out := bdPurge(t, bd, dir, "--pattern", "pt-*", "--force")
|
|
_ = out // Should succeed or find no matches
|
|
})
|
|
}
|
|
|
|
// TestEmbeddedPurgeConcurrent exercises purge --dry-run concurrently.
|
|
func TestEmbeddedPurgeConcurrent(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", "px")
|
|
|
|
createAndCloseEphemeral(t, bd, dir, "Purge concurrent 1")
|
|
createAndCloseEphemeral(t, bd, dir, "Purge concurrent 2")
|
|
|
|
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, "purge", "--dry-run")
|
|
cmd.Dir = dir
|
|
cmd.Env = bdEnv(dir)
|
|
out, err := cmd.CombinedOutput()
|
|
if err != nil {
|
|
r.err = fmt.Errorf("purge --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)
|
|
}
|
|
}
|
|
}
|