Compare commits

..
Author SHA1 Message Date
BaaRai ac8491d666 fix: inheritance test teardown closes the manager after the DeleteTask cleanups
defer m.Close() ran before the t.Cleanup DeleteTask calls, so they raced a closed database and the late writers they trigger could still touch the temp dir while RemoveAll was already walking it (the CI-only TempDir: directory not empty flake). The manager now closes via a t.Cleanup registered first (runs last, LIFO) and the temp dir is removed with a tolerated failure.
2026-10-12 18:43:41 +02:00
7 changed files with 17 additions and 54 deletions
-4
View File
@@ -13,10 +13,6 @@ import (
// agent test suite so cross-package DELETE cleanup races with db/server
// packages are avoided when running `go test ./...`.
func TestMain(m *testing.M) {
// Own database per package (#80): with separate databases, packages stop
// contending on shared tables and the advisory lock below stops
// serializing go test ./... across packages.
db.SuffixTestDatabase("agent")
dsn, _, err := db.DSN()
if err != nil {
os.Exit(m.Run())
-21
View File
@@ -10,7 +10,6 @@ import (
"errors"
"fmt"
"net/url"
"os"
"strings"
"time"
@@ -97,26 +96,6 @@ func DSN() (dsn, source string, err error) {
return config.PostgresDSN()
}
// SuffixTestDatabase rewrites the ARTEX_PG_DSN environment variable so its
// database name carries the given suffix (artex -> artex_agent). Called from
// package TestMain functions so every go test package runs against its own
// database: parallel package processes then cannot contend on the same tables
// (the under-load deadlock family, #80). No-op when ARTEX_PG_DSN is unset —
// config-file and production paths are untouched. Open creates the suffixed
// database automatically (ensureDatabase).
func SuffixTestDatabase(suffix string) {
v := strings.TrimSpace(os.Getenv("ARTEX_PG_DSN"))
if v == "" {
return
}
u, err := url.Parse(v)
if err != nil || u.Path == "" || u.Path == "/" {
return
}
u.Path = "/" + strings.TrimPrefix(u.Path, "/") + "_" + suffix
_ = os.Setenv("ARTEX_PG_DSN", u.String())
}
// DB wraps the shared *sql.DB. PG handles its own connection pool + concurrency
// (MVCC), so unlike the old SQLite store there is no process-wide write mutex.
type DB struct{ *sql.DB }
-4
View File
@@ -14,10 +14,6 @@ import (
// avoid cross-package cleanup races (e.g. DELETE FROM assets WHERE id > X
// from one package deleting assets created by another).
func TestMain(m *testing.M) {
// Own database per package (#80): with separate databases, packages stop
// contending on shared tables and the advisory lock below stops
// serializing go test ./... across packages.
SuffixTestDatabase("db")
dsn, _, err := DSN()
if err != nil {
// No DB configured — tests that need PG will skip themselves.
-3
View File
@@ -11,9 +11,6 @@ import (
// Initialize an explicitly configured fresh database before taking the same
// suite lock as db, agent and server. Hold it on one pinned connection.
func TestMain(m *testing.M) {
// Own database per package (#80): stop contending on the shared tables of
// a single test database during parallel ./... runs.
db.SuffixTestDatabase("evidence")
if os.Getenv("ARTEX_PG_DSN") == "" {
os.Exit(m.Run())
}
-16
View File
@@ -1,16 +0,0 @@
package llmrec
import (
"os"
"testing"
"github.com/Autumn-27/artex/db"
)
// Run against this package's own database (db.SuffixTestDatabase, #80): the
// recorder tests require an isolated ARTEX_PG_DSN, and the suffix gives them
// one even inside a full parallel ./... run.
func TestMain(m *testing.M) {
db.SuffixTestDatabase("llmrec")
os.Exit(m.Run())
}
+17 -2
View File
@@ -6,17 +6,32 @@ import (
"fmt"
"net/http"
"net/http/httptest"
"os"
"testing"
"github.com/Autumn-27/artex/db"
)
func TestInheritedActivityDetailAndRelationDeletion(t *testing.T) {
m, err := NewManager(t.TempDir(), "")
// #78: t.TempDir() cleanup raced with background writers that outlive
// m.Close (TempDir RemoveAll: directory not empty, under CI load). Use a
// manual dir with a tolerated cleanup, and close the manager via t.Cleanup
// registered FIRST so it runs LAST (LIFO): the DeleteTask cleanups below
// then execute while the database is still open instead of racing a closed
// one ("sql: database is closed" teardown noise).
dir, err := os.MkdirTemp("", "inherited-activity-*")
if err != nil {
t.Fatal(err)
}
m, err := NewManager(dir, "")
if err != nil {
_ = os.RemoveAll(dir)
t.Skipf("postgres unavailable (%v) - skipping", err)
}
defer m.Close()
t.Cleanup(func() {
_ = m.Close()
_ = os.RemoveAll(dir) // tolerated: a late background writer may still hold it
})
source, err := m.CreateTaskWithOptions("detail source", "source goal", db.TaskCreateOptions{})
if err != nil {
-4
View File
@@ -13,10 +13,6 @@ import (
// server test suite so cross-package DELETE cleanup races with db/agent
// packages are avoided when running `go test ./...`.
func TestMain(m *testing.M) {
// Own database per package (#80): with separate databases, packages stop
// contending on shared tables and the advisory lock below stops
// serializing go test ./... across packages.
db.SuffixTestDatabase("server")
dsn, _, err := db.DSN()
if err != nil {
os.Exit(m.Run())