* 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>
228 lines
6.4 KiB
Go
228 lines
6.4 KiB
Go
//go:build cgo
|
|
|
|
package main
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
"os/exec"
|
|
"strings"
|
|
"sync"
|
|
"testing"
|
|
)
|
|
|
|
// bdShip runs "bd ship" with the given args and returns stdout.
|
|
func bdShip(t *testing.T, bd, dir string, args ...string) string {
|
|
t.Helper()
|
|
fullArgs := append([]string{"ship"}, args...)
|
|
cmd := exec.Command(bd, fullArgs...)
|
|
cmd.Dir = dir
|
|
cmd.Env = bdEnv(dir)
|
|
out, err := cmd.CombinedOutput()
|
|
if err != nil {
|
|
t.Fatalf("bd ship %s failed: %v\n%s", strings.Join(args, " "), err, out)
|
|
}
|
|
return string(out)
|
|
}
|
|
|
|
// bdShipFail runs "bd ship" expecting failure.
|
|
func bdShipFail(t *testing.T, bd, dir string, args ...string) string {
|
|
t.Helper()
|
|
fullArgs := append([]string{"ship"}, args...)
|
|
cmd := exec.Command(bd, fullArgs...)
|
|
cmd.Dir = dir
|
|
cmd.Env = bdEnv(dir)
|
|
out, err := cmd.CombinedOutput()
|
|
if err == nil {
|
|
t.Fatalf("expected bd ship %s to fail, but succeeded:\n%s", strings.Join(args, " "), out)
|
|
}
|
|
return string(out)
|
|
}
|
|
|
|
func TestEmbeddedShip(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", "sh")
|
|
|
|
// ===== Basic Ship =====
|
|
|
|
t.Run("ship_basic", func(t *testing.T) {
|
|
issue := bdCreate(t, bd, dir, "Ship basic test", "--type", "task")
|
|
// Add export label
|
|
cmd := exec.Command(bd, "label", "add", issue.ID, "export:auth")
|
|
cmd.Dir = dir
|
|
cmd.Env = bdEnv(dir)
|
|
if out, err := cmd.CombinedOutput(); err != nil {
|
|
t.Fatalf("label add failed: %v\n%s", err, out)
|
|
}
|
|
// Close the issue
|
|
cmd = exec.Command(bd, "close", issue.ID)
|
|
cmd.Dir = dir
|
|
cmd.Env = bdEnv(dir)
|
|
if out, err := cmd.CombinedOutput(); err != nil {
|
|
t.Fatalf("close failed: %v\n%s", err, out)
|
|
}
|
|
|
|
out := bdShip(t, bd, dir, "auth")
|
|
if !strings.Contains(out, "Shipped") {
|
|
t.Errorf("expected 'Shipped' in output: %s", out)
|
|
}
|
|
if !strings.Contains(out, "provides:auth") {
|
|
t.Errorf("expected 'provides:auth' in output: %s", out)
|
|
}
|
|
})
|
|
|
|
// ===== --force (ship unclosed issue) =====
|
|
|
|
t.Run("ship_force", func(t *testing.T) {
|
|
issue := bdCreate(t, bd, dir, "Ship force test", "--type", "task")
|
|
cmd := exec.Command(bd, "label", "add", issue.ID, "export:force-cap")
|
|
cmd.Dir = dir
|
|
cmd.Env = bdEnv(dir)
|
|
if out, err := cmd.CombinedOutput(); err != nil {
|
|
t.Fatalf("label add failed: %v\n%s", err, out)
|
|
}
|
|
|
|
// Ship without closing — should fail without --force
|
|
bdShipFail(t, bd, dir, "force-cap")
|
|
|
|
// Ship with --force — should succeed
|
|
out := bdShip(t, bd, dir, "force-cap", "--force")
|
|
if !strings.Contains(out, "Shipped") {
|
|
t.Errorf("expected 'Shipped' with --force: %s", out)
|
|
}
|
|
})
|
|
|
|
// ===== --dry-run =====
|
|
|
|
t.Run("ship_dry_run", func(t *testing.T) {
|
|
issue := bdCreate(t, bd, dir, "Ship dry-run test", "--type", "task")
|
|
cmd := exec.Command(bd, "label", "add", issue.ID, "export:dry-cap")
|
|
cmd.Dir = dir
|
|
cmd.Env = bdEnv(dir)
|
|
if out, err := cmd.CombinedOutput(); err != nil {
|
|
t.Fatalf("label add failed: %v\n%s", err, out)
|
|
}
|
|
cmd = exec.Command(bd, "close", issue.ID)
|
|
cmd.Dir = dir
|
|
cmd.Env = bdEnv(dir)
|
|
if out, err := cmd.CombinedOutput(); err != nil {
|
|
t.Fatalf("close failed: %v\n%s", err, out)
|
|
}
|
|
|
|
out := bdShip(t, bd, dir, "dry-cap", "--dry-run")
|
|
if !strings.Contains(out, "dry run") && !strings.Contains(out, "Would ship") {
|
|
t.Errorf("expected dry-run message: %s", out)
|
|
}
|
|
|
|
// Verify label was NOT added
|
|
cmd = exec.Command(bd, "label", "list", issue.ID, "--json")
|
|
cmd.Dir = dir
|
|
cmd.Env = bdEnv(dir)
|
|
labelOut, labelErr := cmd.CombinedOutput()
|
|
if labelErr != nil {
|
|
t.Fatalf("label list failed: %v\n%s", labelErr, labelOut)
|
|
}
|
|
if strings.Contains(string(labelOut), "provides:dry-cap") {
|
|
t.Errorf("dry-run should not have added provides label: %s", labelOut)
|
|
}
|
|
})
|
|
|
|
// ===== Already Shipped =====
|
|
|
|
t.Run("ship_already_shipped", func(t *testing.T) {
|
|
issue := bdCreate(t, bd, dir, "Ship already test", "--type", "task")
|
|
cmd := exec.Command(bd, "label", "add", issue.ID, "export:already-cap")
|
|
cmd.Dir = dir
|
|
cmd.Env = bdEnv(dir)
|
|
if out, err := cmd.CombinedOutput(); err != nil {
|
|
t.Fatalf("label add failed: %v\n%s", err, out)
|
|
}
|
|
cmd = exec.Command(bd, "close", issue.ID)
|
|
cmd.Dir = dir
|
|
cmd.Env = bdEnv(dir)
|
|
if out, err := cmd.CombinedOutput(); err != nil {
|
|
t.Fatalf("close failed: %v\n%s", err, out)
|
|
}
|
|
|
|
// Ship once
|
|
bdShip(t, bd, dir, "already-cap")
|
|
// Ship again — should report already shipped
|
|
out := bdShip(t, bd, dir, "already-cap")
|
|
if !strings.Contains(out, "already shipped") && !strings.Contains(out, "already_shipped") {
|
|
t.Errorf("expected 'already shipped' message: %s", out)
|
|
}
|
|
})
|
|
|
|
// ===== No Export Label =====
|
|
|
|
t.Run("ship_no_export_label", func(t *testing.T) {
|
|
bdShipFail(t, bd, dir, "nonexistent-capability-xyz")
|
|
})
|
|
}
|
|
|
|
// TestEmbeddedShipConcurrent exercises ship --dry-run concurrently.
|
|
func TestEmbeddedShipConcurrent(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", "sx")
|
|
|
|
// Pre-create issues with export labels
|
|
for i := 0; i < 8; i++ {
|
|
issue := bdCreate(t, bd, dir, fmt.Sprintf("ship-concurrent-%d", i), "--type", "task")
|
|
cap := fmt.Sprintf("cap-%d", i)
|
|
cmd := exec.Command(bd, "label", "add", issue.ID, "export:"+cap)
|
|
cmd.Dir = dir
|
|
cmd.Env = bdEnv(dir)
|
|
if out, err := cmd.CombinedOutput(); err != nil {
|
|
t.Fatalf("label add failed: %v\n%s", err, out)
|
|
}
|
|
cmd = exec.Command(bd, "close", issue.ID)
|
|
cmd.Dir = dir
|
|
cmd.Env = bdEnv(dir)
|
|
if out, err := cmd.CombinedOutput(); err != nil {
|
|
t.Fatalf("close failed: %v\n%s", err, out)
|
|
}
|
|
}
|
|
|
|
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}
|
|
cap := fmt.Sprintf("cap-%d", worker)
|
|
|
|
cmd := exec.Command(bd, "ship", cap, "--dry-run")
|
|
cmd.Dir = dir
|
|
cmd.Env = bdEnv(dir)
|
|
out, err := cmd.CombinedOutput()
|
|
if err != nil {
|
|
r.err = fmt.Errorf("ship --dry-run %s (worker %d): %v\n%s", cap, 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)
|
|
}
|
|
}
|
|
}
|