* 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>
139 lines
3.4 KiB
Go
139 lines
3.4 KiB
Go
//go:build cgo
|
|
|
|
package main
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
"os/exec"
|
|
"strings"
|
|
"sync"
|
|
"testing"
|
|
)
|
|
|
|
// bdPrime runs "bd prime" with the given args and returns stdout.
|
|
func bdPrime(t *testing.T, bd, dir string, args ...string) string {
|
|
t.Helper()
|
|
fullArgs := append([]string{"prime"}, args...)
|
|
cmd := exec.Command(bd, fullArgs...)
|
|
cmd.Dir = dir
|
|
cmd.Env = bdEnv(dir)
|
|
out, err := cmd.CombinedOutput()
|
|
if err != nil {
|
|
t.Fatalf("bd prime %s failed: %v\n%s", strings.Join(args, " "), err, out)
|
|
}
|
|
return string(out)
|
|
}
|
|
|
|
func TestEmbeddedPrime(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", "tp")
|
|
|
|
// ===== Default Output =====
|
|
|
|
t.Run("prime_default", func(t *testing.T) {
|
|
out := bdPrime(t, bd, dir)
|
|
if len(strings.TrimSpace(out)) == 0 {
|
|
t.Error("expected non-empty prime output")
|
|
}
|
|
})
|
|
|
|
// ===== Full Flag =====
|
|
|
|
t.Run("prime_full", func(t *testing.T) {
|
|
out := bdPrime(t, bd, dir, "--full")
|
|
if len(strings.TrimSpace(out)) == 0 {
|
|
t.Error("expected non-empty prime --full output")
|
|
}
|
|
// Full mode should include command references
|
|
if !strings.Contains(out, "bd") {
|
|
t.Errorf("expected 'bd' command references in --full output: %s", out[:min(200, len(out))])
|
|
}
|
|
})
|
|
|
|
// ===== Export Flag =====
|
|
|
|
t.Run("prime_export", func(t *testing.T) {
|
|
out := bdPrime(t, bd, dir, "--export")
|
|
if len(strings.TrimSpace(out)) == 0 {
|
|
t.Error("expected non-empty prime --export output")
|
|
}
|
|
})
|
|
|
|
// ===== Memories Injected =====
|
|
|
|
t.Run("prime_memories_injected", func(t *testing.T) {
|
|
// Store a memory
|
|
cmd := exec.Command(bd, "remember", "always use -race flag in tests", "--key", "prime-test-mem")
|
|
cmd.Dir = dir
|
|
cmd.Env = bdEnv(dir)
|
|
out, err := cmd.CombinedOutput()
|
|
if err != nil {
|
|
t.Fatalf("bd remember failed: %v\n%s", err, out)
|
|
}
|
|
|
|
// Prime should include the memory
|
|
primeOut := bdPrime(t, bd, dir, "--full")
|
|
if !strings.Contains(primeOut, "race") {
|
|
t.Errorf("expected memory content in prime output: %s", primeOut[:min(500, len(primeOut))])
|
|
}
|
|
})
|
|
}
|
|
|
|
// TestEmbeddedPrimeConcurrent exercises prime operations concurrently.
|
|
func TestEmbeddedPrimeConcurrent(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")
|
|
|
|
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, "prime", "--full")
|
|
cmd.Dir = dir
|
|
cmd.Env = bdEnv(dir)
|
|
out, err := cmd.CombinedOutput()
|
|
if err != nil {
|
|
r.err = fmt.Errorf("prime --full (worker %d): %v\n%s", worker, err, out)
|
|
results[worker] = r
|
|
return
|
|
}
|
|
if len(strings.TrimSpace(string(out))) == 0 {
|
|
r.err = fmt.Errorf("prime --full (worker %d): empty output", worker)
|
|
results[worker] = r
|
|
return
|
|
}
|
|
|
|
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)
|
|
}
|
|
}
|
|
}
|