* 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>
211 lines
5.3 KiB
Go
211 lines
5.3 KiB
Go
//go:build cgo
|
|
|
|
package main
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
"os/exec"
|
|
"strings"
|
|
"sync"
|
|
"testing"
|
|
)
|
|
|
|
// bdGraph runs "bd graph" with the given args and returns raw stdout.
|
|
func bdGraph(t *testing.T, bd, dir string, args ...string) string {
|
|
t.Helper()
|
|
fullArgs := append([]string{"graph"}, args...)
|
|
cmd := exec.Command(bd, fullArgs...)
|
|
cmd.Dir = dir
|
|
cmd.Env = bdEnv(dir)
|
|
out, err := cmd.CombinedOutput()
|
|
if err != nil {
|
|
t.Fatalf("bd graph %s failed: %v\n%s", strings.Join(args, " "), err, out)
|
|
}
|
|
return string(out)
|
|
}
|
|
|
|
func TestEmbeddedGraph(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", "gr")
|
|
|
|
// Create an epic with dependencies for graph testing.
|
|
epic := bdCreate(t, bd, dir, "Graph epic", "--type", "epic")
|
|
taskA := bdCreate(t, bd, dir, "Graph task A", "--type", "task")
|
|
taskB := bdCreate(t, bd, dir, "Graph task B", "--type", "task")
|
|
taskC := bdCreate(t, bd, dir, "Graph task C", "--type", "task")
|
|
bdDep(t, bd, dir, "add", taskA.ID, epic.ID, "--type", "parent-child")
|
|
bdDep(t, bd, dir, "add", taskB.ID, epic.ID, "--type", "parent-child")
|
|
bdDep(t, bd, dir, "add", taskC.ID, taskA.ID) // C depends on A
|
|
|
|
standalone := bdCreate(t, bd, dir, "Standalone issue", "--type", "task")
|
|
|
|
// ===== Single issue graph =====
|
|
|
|
t.Run("single_issue", func(t *testing.T) {
|
|
out := bdGraph(t, bd, dir, epic.ID)
|
|
if !strings.Contains(out, epic.ID) {
|
|
t.Errorf("expected epic ID in graph: %s", out)
|
|
}
|
|
})
|
|
|
|
// ===== --all =====
|
|
|
|
t.Run("all_issues", func(t *testing.T) {
|
|
out := bdGraph(t, bd, dir, "--all")
|
|
if !strings.Contains(out, epic.ID) {
|
|
t.Errorf("expected epic in --all graph: %s", out)
|
|
}
|
|
})
|
|
|
|
// ===== --compact =====
|
|
|
|
t.Run("compact_format", func(t *testing.T) {
|
|
out := bdGraph(t, bd, dir, "--compact", epic.ID)
|
|
if len(out) == 0 {
|
|
t.Error("expected non-empty compact output")
|
|
}
|
|
})
|
|
|
|
// ===== --box =====
|
|
|
|
t.Run("box_format", func(t *testing.T) {
|
|
out := bdGraph(t, bd, dir, "--box", epic.ID)
|
|
if len(out) == 0 {
|
|
t.Error("expected non-empty box output")
|
|
}
|
|
})
|
|
|
|
// ===== --dot =====
|
|
|
|
t.Run("dot_format", func(t *testing.T) {
|
|
out := bdGraph(t, bd, dir, "--dot", epic.ID)
|
|
if !strings.Contains(out, "digraph") {
|
|
t.Errorf("expected 'digraph' in DOT output: %s", out)
|
|
}
|
|
})
|
|
|
|
// ===== --html =====
|
|
|
|
t.Run("html_format", func(t *testing.T) {
|
|
out := bdGraph(t, bd, dir, "--html", epic.ID)
|
|
if !strings.Contains(out, "<html") && !strings.Contains(out, "<!DOCTYPE") {
|
|
t.Errorf("expected HTML output: %s", out[:min(200, len(out))])
|
|
}
|
|
})
|
|
|
|
// ===== --json =====
|
|
|
|
t.Run("json_output", func(t *testing.T) {
|
|
fullArgs := []string{"graph", "--json", epic.ID}
|
|
cmd := exec.Command(bd, fullArgs...)
|
|
cmd.Dir = dir
|
|
cmd.Env = bdEnv(dir)
|
|
out, err := cmd.CombinedOutput()
|
|
if err != nil {
|
|
t.Fatalf("graph --json failed: %v\n%s", err, out)
|
|
}
|
|
if !strings.Contains(string(out), epic.ID) {
|
|
t.Errorf("expected epic ID in JSON output: %s", out)
|
|
}
|
|
})
|
|
|
|
// ===== Issue with no dependencies =====
|
|
|
|
t.Run("no_dependencies", func(t *testing.T) {
|
|
out := bdGraph(t, bd, dir, standalone.ID)
|
|
// Should still produce output for the standalone issue
|
|
if !strings.Contains(out, standalone.ID) {
|
|
t.Errorf("expected standalone ID in graph: %s", out)
|
|
}
|
|
})
|
|
|
|
// ===== --all --compact =====
|
|
|
|
t.Run("all_compact", func(t *testing.T) {
|
|
out := bdGraph(t, bd, dir, "--all", "--compact")
|
|
if len(out) == 0 {
|
|
t.Error("expected non-empty all+compact output")
|
|
}
|
|
})
|
|
|
|
// ===== --all --dot =====
|
|
|
|
t.Run("all_dot", func(t *testing.T) {
|
|
out := bdGraph(t, bd, dir, "--all", "--dot")
|
|
if !strings.Contains(out, "digraph") {
|
|
t.Errorf("expected 'digraph' in all+dot: %s", out)
|
|
}
|
|
})
|
|
}
|
|
|
|
// TestEmbeddedGraphConcurrent exercises graph operations concurrently.
|
|
func TestEmbeddedGraphConcurrent(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", "grc")
|
|
|
|
// Create issues with deps.
|
|
var ids []string
|
|
for i := 0; i < 8; i++ {
|
|
issue := bdCreate(t, bd, dir, fmt.Sprintf("concurrent-graph-%d", i), "--type", "task")
|
|
ids = append(ids, issue.ID)
|
|
}
|
|
for i := 0; i < 4; i++ {
|
|
bdDep(t, bd, dir, "add", ids[i*2], ids[i*2+1])
|
|
}
|
|
|
|
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}
|
|
|
|
formats := [][]string{
|
|
{ids[worker]},
|
|
{"--compact", ids[worker]},
|
|
{"--dot", ids[worker]},
|
|
{"--box", ids[worker]},
|
|
{"--all"},
|
|
{"--all", "--compact"},
|
|
{"--all", "--dot"},
|
|
{ids[worker]},
|
|
}
|
|
f := formats[worker%len(formats)]
|
|
|
|
args := append([]string{"graph"}, f...)
|
|
cmd := exec.Command(bd, args...)
|
|
cmd.Dir = dir
|
|
cmd.Env = bdEnv(dir)
|
|
out, err := cmd.CombinedOutput()
|
|
if err != nil {
|
|
r.err = fmt.Errorf("worker %d graph: %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)
|
|
}
|
|
}
|
|
}
|