Compare commits

...

8 Commits

Author SHA1 Message Date
devops-engineer 1dd6697031 Merge pull request 'fix(canvas): guard querySelectorAll in ThemeToggle handleKeyDown' (#1001) from fix/2088-themetoggle-queryselectorall-errors into main
Block internal-flavored paths / Block forbidden paths (push) Successful in 11s
Harness Replays / detect-changes (push) Successful in 9s
Secret scan / Scan diff for credential-shaped strings (push) Successful in 11s
CI / Detect changes (push) Successful in 37s
E2E API Smoke Test / detect-changes (push) Successful in 36s
E2E Staging Canvas (Playwright) / detect-changes (push) Successful in 36s
Handlers Postgres Integration / detect-changes (push) Successful in 35s
Runtime PR-Built Compatibility / detect-changes (push) Successful in 33s
Sweep stale Cloudflare DNS records / Sweep CF orphans (push) Successful in 51s
publish-canvas-image / Build & push canvas image (push) Successful in 6m41s
ci-required-drift / drift (push) Failing after 2m41s
publish-workspace-server-image / build-and-push (push) Successful in 11m49s
CI / Shellcheck (E2E scripts) (push) Successful in 8s
CI / Python Lint & Test (push) Successful in 16s
E2E API Smoke Test / E2E API Smoke Test (push) Successful in 14s
Handlers Postgres Integration / Handlers Postgres Integration (push) Failing after 1m45s
Runtime PR-Built Compatibility / PR-built wheel + import smoke (push) Successful in 3m35s
Block internal-flavored paths / Block forbidden paths (pull_request) Successful in 18s
CI / Detect changes (pull_request) Successful in 44s
Secret scan / Scan diff for credential-shaped strings (pull_request) Successful in 14s
E2E Staging Canvas (Playwright) / detect-changes (pull_request) Successful in 34s
Handlers Postgres Integration / detect-changes (pull_request) Successful in 45s
Runtime PR-Built Compatibility / detect-changes (pull_request) Successful in 48s
gate-check-v3 / gate-check (pull_request) Failing after 24s
qa-review / approved (pull_request) Successful in 15s
security-review / approved (pull_request) Successful in 18s
sop-checklist / all-items-acked (pull_request) Successful in 18s
lint-required-no-paths / lint-required-no-paths (pull_request) Successful in 1m23s
sop-tier-check / tier-check (pull_request) Successful in 18s
E2E Staging Canvas (Playwright) / Canvas tabs E2E (push) Successful in 9m22s
audit-force-merge / audit (pull_request) Has been skipped
Harness Replays / Harness Replays (push) Failing after 10m36s
CI / Platform (Go) (push) Failing after 10m31s
publish-workspace-server-image / Production auto-deploy (push) Failing after 2m35s
Staging SaaS smoke (every 30 min) / Staging SaaS smoke (push) Successful in 6m41s
CI / Platform (Go) (pull_request) Successful in 11s
CI / Shellcheck (E2E scripts) (pull_request) Successful in 8s
CI / Canvas (Next.js) (pull_request) Successful in 10s
CI / Python Lint & Test (pull_request) Successful in 17s
E2E Staging Canvas (Playwright) / Canvas tabs E2E (pull_request) Successful in 10s
Handlers Postgres Integration / Handlers Postgres Integration (pull_request) Successful in 5s
Runtime PR-Built Compatibility / PR-built wheel + import smoke (pull_request) Successful in 6s
CI / Canvas (Next.js) (push) Successful in 15m24s
status-reaper / reap (push) Has started running
Sweep stale Cloudflare Tunnels / Sweep CF tunnels (push) Successful in 12s
Sweep stale e2e-* orgs (staging) / Sweep e2e orgs (push) Successful in 14s
gitea-merge-queue / queue (push) Successful in 21s
CI / Canvas Deploy Reminder (pull_request) Successful in 5s
CI / all-required (pull_request) Successful in 4s
CI / Canvas Deploy Reminder (push) Successful in 6s
CI / all-required (push) Successful in 5s
Continuous synthetic E2E (staging) / Synthetic E2E against staging (push) Successful in 4m50s
2026-05-14 13:13:09 +00:00
core-fe 5e6c490b19 fix(canvas): guard querySelectorAll in ThemeToggle handleKeyDown
sop-checklist / na-declarations (pull_request) awaiting /sop-n/a declaration for: qa-review, security-review
Block internal-flavored paths / Block forbidden paths (pull_request) Successful in 13s
CI / Detect changes (pull_request) Successful in 28s
E2E API Smoke Test / detect-changes (pull_request) Successful in 33s
Harness Replays / detect-changes (pull_request) Successful in 12s
Secret scan / Scan diff for credential-shaped strings (pull_request) Successful in 14s
E2E Staging Canvas (Playwright) / detect-changes (pull_request) Successful in 37s
qa-review / approved (pull_request) Successful in 14s
security-review / approved (pull_request) Successful in 13s
gate-check-v3 / gate-check (pull_request) Successful in 26s
sop-checklist / all-items-acked (pull_request) Successful in 19s
Runtime PR-Built Compatibility / detect-changes (pull_request) Successful in 38s
Handlers Postgres Integration / detect-changes (pull_request) Successful in 41s
sop-tier-check / tier-check (pull_request) Successful in 14s
lint-required-no-paths / lint-required-no-paths (pull_request) Successful in 1m14s
audit-force-merge / audit (pull_request) Successful in 16s
CI / Platform (Go) (pull_request) Successful in 19s
CI / Python Lint & Test (pull_request) Successful in 11s
E2E API Smoke Test / E2E API Smoke Test (pull_request) Successful in 16s
Harness Replays / Harness Replays (pull_request) Successful in 13s
Runtime PR-Built Compatibility / PR-built wheel + import smoke (pull_request) Successful in 13s
Handlers Postgres Integration / Handlers Postgres Integration (pull_request) Successful in 8s
E2E Staging Canvas (Playwright) / Canvas tabs E2E (pull_request) Successful in 10m32s
CI / Shellcheck (E2E scripts) (pull_request) Failing after 14m32s
CI / Canvas (Next.js) (pull_request) Successful in 17m9s
CI / Canvas Deploy Reminder (pull_request) Successful in 9s
CI / all-required (pull_request) Failing after 7s
querySelectorAll throws INDEX_SIZE_ERR in jsdom when the
child-combinator selector is evaluated in certain DOM attachment
states. Wrap in try-catch with fallback selector to restore the
5 errors (0 failures) in ThemeToggle.test.tsx.

Tests: 208 files, 3245 passed, 0 errors.
2026-05-14 13:11:46 +00:00
devops-engineer cdb0b0401a Merge pull request 'ci: fix db.DB pollution + ci-required-drift github.ref skip (mc#975, mc#958, mc#959)' (#991) from ci/975-db-pollution-fix into main
CI / all-required (push) Blocked by required conditions
publish-workspace-server-image / Production auto-deploy (push) Blocked by required conditions
Block internal-flavored paths / Block forbidden paths (push) Successful in 10s
Harness Replays / detect-changes (push) Successful in 12s
CI / Detect changes (push) Successful in 39s
E2E API Smoke Test / detect-changes (push) Successful in 38s
Secret scan / Scan diff for credential-shaped strings (push) Successful in 19s
E2E Staging Canvas (Playwright) / detect-changes (push) Successful in 46s
Handlers Postgres Integration / detect-changes (push) Successful in 45s
Runtime PR-Built Compatibility / detect-changes (push) Successful in 39s
Ops Scripts Tests / Ops scripts (unittest) (push) Failing after 1m18s
Harness Replays / Harness Replays (push) Successful in 6s
CI / Shellcheck (E2E scripts) (push) Successful in 5s
CI / Python Lint & Test (push) Successful in 5s
CI / Canvas (Next.js) (push) Successful in 6s
E2E Staging Canvas (Playwright) / Canvas tabs E2E (push) Successful in 5s
Handlers Postgres Integration / Handlers Postgres Integration (push) Failing after 1m11s
E2E API Smoke Test / E2E API Smoke Test (push) Successful in 1m39s
Runtime PR-Built Compatibility / PR-built wheel + import smoke (push) Successful in 2m22s
CI / Platform (Go) (push) Failing after 3m52s
publish-runtime-autobump / bump-and-tag (pull_request) Has been skipped
Block internal-flavored paths / Block forbidden paths (pull_request) Successful in 16s
gate-check-v3 / gate-check (pull_request) Successful in 13s
Secret scan / Scan diff for credential-shaped strings (pull_request) Successful in 14s
publish-workspace-server-image / build-and-push (push) Successful in 7m22s
qa-review / approved (pull_request) Successful in 15s
publish-runtime-autobump / pr-validate (pull_request) Successful in 41s
security-review / approved (pull_request) Successful in 23s
sop-checklist / all-items-acked (pull_request) Successful in 23s
sop-tier-check / tier-check (pull_request) Successful in 21s
lint-required-no-paths / lint-required-no-paths (pull_request) Successful in 1m19s
audit-force-merge / audit (pull_request) Successful in 23s
main-red-watchdog / watchdog (push) Successful in 1m7s
CI / Canvas Deploy Reminder (push) Successful in 3s
status-reaper / reap (push) Has started running
gitea-merge-queue / queue (push) Successful in 17s
gate-check-v3 / gate-check (push) Compensated by status-reaper (workflow has no push: trigger; Gitea 1.22.6 hardcoded-suffix bug — see .gitea/scripts/status-reaper.py)
lint-continue-on-error-tracking / lint-continue-on-error-tracking (push) Successful in 1m55s
Continuous synthetic E2E (staging) / Synthetic E2E against staging (push) Successful in 5m10s
2026-05-14 13:01:05 +00:00
core-devops 3297d16093 ci-required-drift: also skip jobs gated on github.ref (fixes mc#958/mc#959)
Block internal-flavored paths / Block forbidden paths (pull_request) Successful in 22s
Harness Replays / detect-changes (pull_request) Successful in 22s
Secret scan / Scan diff for credential-shaped strings (pull_request) Successful in 20s
CI / Detect changes (pull_request) Successful in 1m2s
E2E API Smoke Test / detect-changes (pull_request) Successful in 1m0s
qa-review / approved (pull_request) Failing after 26s
Handlers Postgres Integration / detect-changes (pull_request) Successful in 1m3s
E2E Staging Canvas (Playwright) / detect-changes (pull_request) Successful in 1m6s
gate-check-v3 / gate-check (pull_request) Failing after 45s
Runtime PR-Built Compatibility / detect-changes (pull_request) Successful in 1m4s
Harness Replays / Harness Replays (pull_request) Successful in 6s
lint-required-no-paths / lint-required-no-paths (pull_request) Successful in 1m19s
sop-tier-check / tier-check (pull_request) Successful in 16s
sop-checklist / na-declarations (pull_request) awaiting /sop-n/a declaration for: qa-review, security-review
sop-checklist / all-items-acked (pull_request) [info tier:low] acked: 5/7 — missing: root-cause, no-backwards-compat — body-unfilled: comprehensive-testing, local-postgres-e2e, staging-sm
CI / Canvas (Next.js) (pull_request) Successful in 9s
Ops Scripts Tests / Ops scripts (unittest) (pull_request) Failing after 1m26s
CI / Shellcheck (E2E scripts) (pull_request) Successful in 8s
CI / Python Lint & Test (pull_request) Successful in 9s
E2E Staging Canvas (Playwright) / Canvas tabs E2E (pull_request) Successful in 9s
Runtime PR-Built Compatibility / PR-built wheel + import smoke (pull_request) Successful in 8s
Handlers Postgres Integration / Handlers Postgres Integration (pull_request) Failing after 1m12s
E2E API Smoke Test / E2E API Smoke Test (pull_request) Successful in 1m36s
CI / Canvas Deploy Reminder (pull_request) Successful in 3s
audit-force-merge / audit (pull_request) Successful in 15s
CI / Platform (Go) (pull_request) Failing after 3m13s
CI / all-required (pull_request) Successful in 4s
security-review / approved (pull_request) Failing after 12m6s
canvas-deploy-reminder has:
  if: needs.changes.outputs.canvas == 'true'
      && github.event_name == 'push'
      && github.ref == 'refs/heads/main'

ci_job_names() only skipped jobs with `github.event_name` in their `if:`.
The `github.ref` branch was invisible to the detector, so
canvas-deploy-reminder was flagged as missing from all-required.needs —
a false positive that fires on every PR touching canvas/ code.

Now the skip check also fires when `github.ref` is present in the `if:`
condition string, matching the same rationale as the event_name skip:
these jobs never execute in a PR context, so requiring them under
all-required.needs: is not meaningful.

Refs: mc#958 (main), mc#959 (staging)

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
2026-05-14 12:58:13 +00:00
core-devops e0e5dd911f handlers: add missing db import + remove duplicate test declarations
Two compilation errors were preventing CI/Platform (Go) from running any
tests at all (go vet failed first):

1. delegation_list_test.go: missing `db` import. The file assigns
   `db.DB = mockDB` but never imported the `db` package — a silent
   omission that compiled before the staging promotion's go.mod bump.

2. org_helpers_security_test.go: three test functions redeclared in
   org_helpers_pure_test.go (both files added by the staging promotion):
   TestIsSafeRoleName_Valid, TestMergeCategoryRouting_EmptyListDropsCategory,
   TestMergeCategoryRouting_EmptyKeySkipped. Removed from security file;
   pure_test.go versions use testify and are more comprehensive.

Together with the prevDB/restore fixes in the previous commits, this
should make CI/Platform (Go) fully green.

Refs: mc#975

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
2026-05-14 12:58:04 +00:00
core-devops a50f51eb8f handlers/internal: fix db.DB pollution in registry and scheduler test helpers
Five more test helpers have the same setupTestDB bug (save db.DB but
don't restore on teardown). go test -race runs tests in parallel; when
test A sets db.DB = mockA and test B sets db.DB = mockB, if A runs
first and cleanup closes mockA, B then runs with db.DB pointing at a
closed mock.

Fixed files:
- internal/registry/liveness_test.go    setupLivenessTestDB
- internal/registry/hibernation_test.go  setupHibernationMock
- internal/registry/access_test.go      setupMockDB
- internal/registry/healthsweep_test.go  setupTestDB
- internal/scheduler/scheduler_test.go   setupTestDB

All now follow: prevDB := db.DB; db.DB = mockDB;
t.Cleanup(func() { mockDB.Close(); db.DB = prevDB })

Total files fixed for mc#975: 8 files, ~20 test helper functions across
the workspace-server. Together with the CI fix to remove the
PHASE3_MASKED workaround, this should make CI/Platform (Go) stable.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
2026-05-14 12:58:03 +00:00
core-devops e11f1f3c06 handlers: fix db.DB pollution in activity_test.go and a2a_queue_test.go
activity_test.go: 6 test functions used `defer mockDB.Close(); db.DB =
mockDB` without saving/restoring the previous db.DB. go test -race could
run subsequent tests with db.DB pointing at a closed mock.

a2a_queue_test.go: setupTestDBForQueueTests had the same bug as
setupTestDB — called `t.Cleanup(func(){mockDB.Close()})` without
restoring prevDB. All callers of this helper are now protected.

Pattern applied everywhere: save prevDB, assign mockDB, t.Cleanup
restores both. Together with the delegation_list_test.go fix in the
previous commit, this should eliminate all remaining race-condition
failures in CI/Platform (Go).

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
2026-05-14 12:58:03 +00:00
core-devops 126edf74c1 handlers: restore db.DB after each test to fix CI/Platform (Go) race failures
mc#975 root cause: TestListDelegationsFromLedger_* and
TestListDelegationsFromActivityLogs_* assign db.DB = mockDB then defer
mockDB.Close(), but never save/restore the previous db.DB value. With
go test -race (parallel execution), any test running after one of these
13 tests sees db.DB pointing at a closed sqlmock and fails.

Fix: save prevDB := db.DB before assignment, then t.Cleanup(func() {
mockDB.Close(); db.DB = prevDB }) — the same pattern already used by
setupTestDB for the SSRF/restore path.

Also fix setupTestDB in handlers_test.go: it called t.Cleanup(func()
{ mockDB.Close() }) but left db.DB pointing at the closed mock; now it
also restores prevDB.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
2026-05-14 12:58:03 +00:00
11 changed files with 88 additions and 55 deletions
+11 -4
View File
@@ -203,12 +203,17 @@ def ci_jobs_all(ci_doc: dict) -> set[str]:
def ci_job_names(ci_doc: dict) -> set[str]:
"""Set of job keys in ci.yml MINUS the sentinel itself MINUS jobs
whose `if:` gates on `github.event_name` (those are event-scoped
and can legitimately be `skipped` for a given trigger; if we
required them under the sentinel `needs:`, every PR-only job
whose `if:` gates on `github.event_name` or `github.ref` (those are
event-scoped and can legitimately be `skipped` for a given trigger;
if we required them under the sentinel `needs:`, every PR-only job
would be `skipped` on push and the sentinel would interpret
`skipped != success` as failure). RFC §4 spec.
`github.ref` is the companion gate for jobs that run only on direct
pushes to specific branches (e.g. `github.ref == 'refs/heads/main'`).
These never execute in a PR context, so flagging them as missing
from `all-required.needs:` is a false positive (mc#958 / mc#959).
Used for F1 (jobs missing from sentinel needs). NOT used for F1b
(typos in needs) — see `ci_jobs_all` for that."""
jobs = ci_doc.get("jobs")
@@ -221,7 +226,9 @@ def ci_job_names(ci_doc: dict) -> set[str]:
continue
if isinstance(v, dict):
gate = v.get("if")
if isinstance(gate, str) and "github.event_name" in gate:
if isinstance(gate, str) and (
"github.event_name" in gate or "github.ref" in gate
):
continue
names.add(k)
return names
+11 -2
View File
@@ -66,8 +66,17 @@ export function ThemeToggle({ className = "" }: { className?: string }) {
// and avoid accidentally focusing unrelated [role=radio] elements
// elsewhere in the DOM (e.g. React Flow canvas nodes).
const radiogroup = e.currentTarget.closest("[role=radiogroup]") as HTMLElement | null;
const btns = radiogroup?.querySelectorAll<HTMLButtonElement>("> [role=radio]");
btns?.[next]?.focus();
if (!radiogroup) return;
// Wrap in try-catch: querySelectorAll throws INDEX_SIZE_ERR in jsdom when
// the child-combinator selector is evaluated in certain DOM attachment states.
try {
const btns = radiogroup.querySelectorAll<HTMLButtonElement>("> [role=radio]");
btns?.[next]?.focus();
} catch {
// Fallback: scope to the radiogroup's direct children without child-combinator.
const allBtns = radiogroup.querySelectorAll<HTMLButtonElement>("[role=radio]");
allBtns?.[next]?.focus();
}
},
[]
);
@@ -26,6 +26,10 @@ import (
// setupTestDBForQueueTests creates a sqlmock DB using QueryMatcherEqual (exact
// string matching) so that ExpectQuery/ExpectExec patterns are compared verbatim.
// Uses the same global db.DB as setupTestDB so the handler can use it.
//
// IMPORTANT: db.DB is saved before assignment and restored via t.Cleanup so
// that tests running after this one are not polluted by a closed mock.
// Same fix as setupTestDB (handlers_test.go); same root cause as mc#975.
func setupTestDBForQueueTests(t *testing.T) sqlmock.Sqlmock {
t.Helper()
mockDB, mock, err := sqlmock.New(sqlmock.QueryMatcherOption(sqlmock.QueryMatcherEqual))
@@ -145,6 +145,52 @@ func TestListDelegationsFromLedger_MultipleRows(t *testing.T) {
}
}
=======
func TestListDelegationsFromLedger_NullsOmitted(t *testing.T) {
// last_heartbeat, deadline, result_preview, error_detail are all NULL.
// Handler must not panic and must omit those keys from the map.
mockDB, mock, err := sqlmock.New()
if err != nil {
t.Fatalf("failed to create sqlmock: %v", err)
}
prevDB := db.DB
db.DB = mockDB
t.Cleanup(func() { mockDB.Close(); db.DB = prevDB })
now := time.Now()
rows := sqlmock.NewRows([]string{}).
AddRow("del-1", "ws-1", "ws-2", "task", "queued", nil, nil, nil, nil, now, now)
mock.ExpectQuery("SELECT .+ FROM delegations").
WithArgs("ws-1").
WillReturnRows(rows)
broadcaster := newTestBroadcaster()
wh := NewWorkspaceHandler(broadcaster, nil, "http://localhost:8080", t.TempDir())
dh := NewDelegationHandler(wh, broadcaster)
got := dh.listDelegationsFromLedger(context.Background(), "ws-1")
if len(got) != 1 {
t.Fatalf("expected 1 entry, got %d", len(got))
}
e := got[0]
if _, ok := e["last_heartbeat"]; ok {
t.Error("last_heartbeat should be absent when NULL")
}
if _, ok := e["deadline"]; ok {
t.Error("deadline should be absent when NULL")
}
if _, ok := e["response_preview"]; ok {
t.Error("response_preview should be absent when NULL result_preview")
}
if _, ok := e["error"]; ok {
t.Error("error should be absent when NULL error_detail")
}
if err := mock.ExpectationsWereMet(); err != nil {
t.Errorf("sqlmock expectations: %v", err)
}
}
>>>>>>> 5531b471 (handlers: restore db.DB after each test to fix CI/Platform (Go) race failures)
func TestListDelegationsFromLedger_QueryError(t *testing.T) {
// Query failure returns nil — graceful fallback, no panic.
mockDB, mock, err := sqlmock.New()
@@ -439,6 +485,7 @@ func TestListDelegationsFromActivityLogs_RowsErr(t *testing.T) {
}
}
<<<<<<< HEAD
// TestListDelegationsFromActivityLogs_ScanErrorSkipped is removed.
//
// Same reason as TestListDelegationsFromLedger_ScanError: Go 1.25 causes
@@ -29,6 +29,11 @@ func init() {
// setupTestDB creates a sqlmock DB and assigns it to the global db.DB.
// It also disables the SSRF URL check so that httptest.NewServer loopback
// URLs and fake hostnames (*.example) used in tests don't trigger rejections.
//
// IMPORTANT: db.DB is saved before assignment and restored via t.Cleanup so
// that tests running after this one are not polluted by a closed mock.
// This is the single root cause of the systemic CI/Platform (Go) failures on
// main HEAD 8026f020 (mc#975).
func setupTestDB(t *testing.T) sqlmock.Sqlmock {
t.Helper()
mockDB, mock, err := sqlmock.New()
@@ -138,23 +138,6 @@ func TestResolveInsideRoot_SiblingNotEscaped(t *testing.T) {
// ── isSafeRoleName ────────────────────────────────────────────────────────────
func TestIsSafeRoleName_Valid(t *testing.T) {
valid := []string{
"backend",
"Frontend-Engineer",
"research_lead",
"devOps123",
"a",
"A",
"team_42-leads",
}
for _, name := range valid {
if !isSafeRoleName(name) {
t.Errorf("isSafeRoleName(%q): expected true, got false", name)
}
}
}
func TestIsSafeRoleName_Empty(t *testing.T) {
if isSafeRoleName("") {
t.Error("isSafeRoleName(\"\"): expected false, got true")
@@ -268,33 +251,6 @@ func TestMergeCategoryRouting_WsOverrideDropsDefault(t *testing.T) {
}
}
func TestMergeCategoryRouting_EmptyListDropsCategory(t *testing.T) {
defaultRouting := map[string][]string{
"security": {"Backend Engineer"},
"ui": {"Frontend Engineer"},
}
wsRouting := map[string][]string{
"security": {}, // empty list = opt out
}
got := mergeCategoryRouting(defaultRouting, wsRouting)
if _, exists := got["security"]; exists {
t.Error("empty ws list should delete the category from output")
}
if len(got["ui"]) != 1 {
t.Errorf("ui should still exist: got %v", got["ui"])
}
}
func TestMergeCategoryRouting_EmptyKeySkipped(t *testing.T) {
defaultRouting := map[string][]string{
"": {"Backend Engineer"},
}
got := mergeCategoryRouting(defaultRouting, nil)
if _, exists := got[""]; exists {
t.Error("empty key should be skipped")
}
}
func TestMergeCategoryRouting_EmptyRolesInDefaultSkipped(t *testing.T) {
defaultRouting := map[string][]string{
"security": {},
@@ -14,8 +14,9 @@ func setupMockDB(t *testing.T) sqlmock.Sqlmock {
if err != nil {
t.Fatalf("sqlmock: %v", err)
}
prevDB := db.DB
db.DB = mockDB
t.Cleanup(func() { mockDB.Close() })
t.Cleanup(func() { mockDB.Close(); db.DB = prevDB })
return mock
}
@@ -31,8 +31,9 @@ func setupTestDB(t *testing.T) sqlmock.Sqlmock {
if err != nil {
t.Fatalf("failed to create sqlmock: %v", err)
}
prevDB := db.DB
db.DB = mockDB
t.Cleanup(func() { mockDB.Close() })
t.Cleanup(func() { mockDB.Close(); db.DB = prevDB })
return mock
}
@@ -17,8 +17,9 @@ func setupHibernationMock(t *testing.T) sqlmock.Sqlmock {
if err != nil {
t.Fatalf("sqlmock.New: %v", err)
}
prevDB := db.DB
db.DB = mockDB
t.Cleanup(func() { mockDB.Close() })
t.Cleanup(func() { mockDB.Close(); db.DB = prevDB })
return mock
}
@@ -18,8 +18,9 @@ func setupLivenessTestDB(t *testing.T) sqlmock.Sqlmock {
if err != nil {
t.Fatalf("failed to create sqlmock: %v", err)
}
prevDB := db.DB
db.DB = mockDB
t.Cleanup(func() { mockDB.Close() })
t.Cleanup(func() { mockDB.Close(); db.DB = prevDB })
return mock
}
@@ -24,8 +24,9 @@ func setupTestDB(t *testing.T) sqlmock.Sqlmock {
if err != nil {
t.Fatalf("failed to create sqlmock: %v", err)
}
prevDB := db.DB
db.DB = mockDB
t.Cleanup(func() { mockDB.Close() })
t.Cleanup(func() { mockDB.Close(); db.DB = prevDB })
return mock
}