* 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>
226 lines
6.1 KiB
Go
226 lines
6.1 KiB
Go
//go:build cgo
|
|
|
|
package main
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
"os/exec"
|
|
"strings"
|
|
"sync"
|
|
"testing"
|
|
|
|
"github.com/steveyegge/beads/internal/types"
|
|
)
|
|
|
|
// bdReopen runs "bd reopen" with the given args and returns stdout.
|
|
func bdReopen(t *testing.T, bd, dir string, args ...string) string {
|
|
t.Helper()
|
|
fullArgs := append([]string{"reopen"}, args...)
|
|
cmd := exec.Command(bd, fullArgs...)
|
|
cmd.Dir = dir
|
|
cmd.Env = bdEnv(dir)
|
|
out, err := cmd.CombinedOutput()
|
|
if err != nil {
|
|
t.Fatalf("bd reopen %s failed: %v\n%s", strings.Join(args, " "), err, out)
|
|
}
|
|
return string(out)
|
|
}
|
|
|
|
func TestEmbeddedReopen(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", "ro")
|
|
|
|
t.Run("reopen_single", func(t *testing.T) {
|
|
issue := bdCreate(t, bd, dir, "Reopen me", "--type", "task")
|
|
bdClose(t, bd, dir, issue.ID)
|
|
got := bdShow(t, bd, dir, issue.ID)
|
|
if got.Status != types.StatusClosed {
|
|
t.Fatalf("expected closed before reopen, got %s", got.Status)
|
|
}
|
|
|
|
out := bdReopen(t, bd, dir, issue.ID)
|
|
if !strings.Contains(out, "Reopened") {
|
|
t.Errorf("expected 'Reopened' in output: %s", out)
|
|
}
|
|
|
|
got = bdShow(t, bd, dir, issue.ID)
|
|
if got.Status != types.StatusOpen {
|
|
t.Errorf("expected open after reopen, got %s", got.Status)
|
|
}
|
|
if got.ClosedAt != nil {
|
|
t.Error("expected closed_at cleared after reopen")
|
|
}
|
|
})
|
|
|
|
t.Run("reopen_multiple", func(t *testing.T) {
|
|
issue1 := bdCreate(t, bd, dir, "Multi reopen 1", "--type", "task")
|
|
issue2 := bdCreate(t, bd, dir, "Multi reopen 2", "--type", "task")
|
|
bdClose(t, bd, dir, issue1.ID, issue2.ID)
|
|
|
|
bdReopen(t, bd, dir, issue1.ID, issue2.ID)
|
|
|
|
got1 := bdShow(t, bd, dir, issue1.ID)
|
|
got2 := bdShow(t, bd, dir, issue2.ID)
|
|
if got1.Status != types.StatusOpen {
|
|
t.Errorf("issue1: expected open, got %s", got1.Status)
|
|
}
|
|
if got2.Status != types.StatusOpen {
|
|
t.Errorf("issue2: expected open, got %s", got2.Status)
|
|
}
|
|
})
|
|
|
|
t.Run("reopen_with_reason", func(t *testing.T) {
|
|
issue := bdCreate(t, bd, dir, "Reason reopen", "--type", "task")
|
|
bdClose(t, bd, dir, issue.ID)
|
|
|
|
out := bdReopen(t, bd, dir, issue.ID, "--reason", "Not actually done")
|
|
if !strings.Contains(out, "Reopened") {
|
|
t.Errorf("expected 'Reopened' in output: %s", out)
|
|
}
|
|
if !strings.Contains(out, "Not actually done") {
|
|
t.Logf("reason may not appear in text output: %s", out)
|
|
}
|
|
})
|
|
|
|
t.Run("reopen_with_reason_short", func(t *testing.T) {
|
|
issue := bdCreate(t, bd, dir, "Short reason reopen", "--type", "task")
|
|
bdClose(t, bd, dir, issue.ID)
|
|
bdReopen(t, bd, dir, issue.ID, "-r", "Needs more work")
|
|
got := bdShow(t, bd, dir, issue.ID)
|
|
if got.Status != types.StatusOpen {
|
|
t.Errorf("expected open, got %s", got.Status)
|
|
}
|
|
})
|
|
|
|
t.Run("reopen_json", func(t *testing.T) {
|
|
issue := bdCreate(t, bd, dir, "JSON reopen", "--type", "task")
|
|
bdClose(t, bd, dir, issue.ID)
|
|
|
|
cmd := exec.Command(bd, "reopen", issue.ID, "--json")
|
|
cmd.Dir = dir
|
|
cmd.Env = bdEnv(dir)
|
|
out, err := cmd.CombinedOutput()
|
|
if err != nil {
|
|
t.Fatalf("bd reopen --json failed: %v\n%s", err, out)
|
|
}
|
|
s := strings.TrimSpace(string(out))
|
|
start := strings.Index(s, "[")
|
|
if start < 0 {
|
|
start = strings.Index(s, "{")
|
|
}
|
|
if start >= 0 {
|
|
// Verify it's valid JSON
|
|
_ = s[start:]
|
|
}
|
|
})
|
|
|
|
t.Run("reopen_already_open", func(t *testing.T) {
|
|
issue := bdCreate(t, bd, dir, "Already open", "--type", "task")
|
|
// Reopen an already-open issue — should not error, just print message
|
|
out := bdReopen(t, bd, dir, issue.ID)
|
|
if !strings.Contains(out, "already open") {
|
|
t.Logf("already-open message: %s", out)
|
|
}
|
|
})
|
|
|
|
t.Run("reopen_clears_defer_until", func(t *testing.T) {
|
|
issue := bdCreate(t, bd, dir, "Deferred reopen", "--type", "task", "--defer", "2030-01-01")
|
|
bdClose(t, bd, dir, issue.ID)
|
|
bdReopen(t, bd, dir, issue.ID)
|
|
got := bdShow(t, bd, dir, issue.ID)
|
|
if got.Status != types.StatusOpen {
|
|
t.Errorf("expected open, got %s", got.Status)
|
|
}
|
|
})
|
|
|
|
t.Run("reopen_nonexistent", func(t *testing.T) {
|
|
cmd := exec.Command(bd, "reopen", "ro-nonexistent999")
|
|
cmd.Dir = dir
|
|
cmd.Env = bdEnv(dir)
|
|
out, err := cmd.CombinedOutput()
|
|
if err == nil {
|
|
t.Fatalf("expected reopen of nonexistent to fail, got: %s", out)
|
|
}
|
|
})
|
|
}
|
|
|
|
// TestEmbeddedReopenConcurrent exercises reopen concurrently.
|
|
func TestEmbeddedReopenConcurrent(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", "rx")
|
|
|
|
const numWorkers = 8
|
|
|
|
// Pre-create and close issues
|
|
var issueIDs []string
|
|
for i := 0; i < numWorkers; i++ {
|
|
issue := bdCreate(t, bd, dir, fmt.Sprintf("concurrent-reopen-%d", i), "--type", "task")
|
|
bdClose(t, bd, dir, issue.ID)
|
|
issueIDs = append(issueIDs, issue.ID)
|
|
}
|
|
|
|
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, "reopen", issueIDs[worker])
|
|
cmd.Dir = dir
|
|
cmd.Env = bdEnv(dir)
|
|
out, err := cmd.CombinedOutput()
|
|
if err != nil {
|
|
r.err = fmt.Errorf("reopen %s: %v\n%s", issueIDs[worker], err, out)
|
|
}
|
|
|
|
results[worker] = r
|
|
}(w)
|
|
}
|
|
wg.Wait()
|
|
|
|
var successes int
|
|
for _, r := range results {
|
|
if r.err != nil {
|
|
if !strings.Contains(r.err.Error(), "one writer at a time") {
|
|
t.Errorf("worker %d failed: %v", r.worker, r.err)
|
|
}
|
|
continue
|
|
}
|
|
successes++
|
|
}
|
|
if successes == 0 {
|
|
t.Fatal("all workers failed; expected at least 1 success")
|
|
}
|
|
t.Logf("%d/%d workers succeeded (flock contention expected)", successes, numWorkers)
|
|
|
|
// Verify only successful workers' issues are reopened
|
|
for _, r := range results {
|
|
if r.err != nil {
|
|
continue
|
|
}
|
|
id := issueIDs[r.worker]
|
|
got := bdShow(t, bd, dir, id)
|
|
if got.Status != types.StatusOpen {
|
|
t.Errorf("expected %s to be open after reopen, got %s", id, got.Status)
|
|
}
|
|
}
|
|
}
|