chore: sync staging-v6 to main HEAD (post mc#991 merge) #1007

Merged

core-devops merged 6 commits from main into staging-v6 2026-05-14 13:05:22 +00:00

Conversation 0 Commits 6 Files Changed 10

+77 -53

core-devops commented 2026-05-14 13:04:42 +00:00

Member

Copy Link

Copy Source

No description provided.

core-devops added 6 commits 2026-05-14 13:04:46 +00:00

handlers: restore db.DB after each test to fix CI/Platform (Go) race failures ... 126edf74c1

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>

handlers: fix db.DB pollution in activity_test.go and a2a_queue_test.go ... e11f1f3c06

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>

handlers/internal: fix db.DB pollution in registry and scheduler test helpers ... a50f51eb8f

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>

handlers: add missing db import + remove duplicate test declarations ... e0e5dd911f

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>

ci-required-drift: also skip jobs gated on github.ref (fixes mc#958/mc#959) ... 3297d16093

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>

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 cdb0b0401a

core-devops merged commit 03b46c89e7 into staging-v6 2026-05-14 13:05:22 +00:00

core-devops referenced this issue from a commit 2026-05-14 13:05:25 +00:00

Merge pull request 'chore: sync staging-v6 to main HEAD (post mc#991 merge)' (#1007) from main into staging-v6

core-devops referenced this pull request 2026-05-14 13:36:22 +00:00

[CRITICAL] HTTP 405 merge blocked — workspace tokens lack write:repository scope (#981) #981

Sign in to join this conversation.

Reviewers

No Reviewers

Labels

Clear labels

area/ci

CI/CD pipeline issues

kind/infrastructure

Infrastructure-related issues

merge-queue

Ready for serialized Gitea merge queue

merge-queue-hold

Temporarily hold PR in merge queue

platform/go

Go platform test issues

release-blocker

Blocks the staging→main promotion / a release

release-test

security

test-label-sre

tier:high

High risk per dev-sop §SOP-6 — ceo only, 24h cooldown

tier:low

Low risk per dev-sop §SOP-6 — engineers/managers/ceo can approve

tier:medium

Medium risk per dev-sop §SOP-6 — managers/ceo can approve

triage-test

test

No Label

Milestone

No items

No Milestone

Projects

Clear projects

No project

Assignees

Clear assignees

agent-dev-a agent-dev-b agent-pm app-fe (Molecule AI · app-fe) app-lead (Molecule AI · app-lead) app-qa (Molecule AI · app-qa) claude-ceo-assistant claude-ci-reader claude-status-reaper core-be (Molecule AI · core-be) core-devops (Molecule AI · core-devops) core-fe (Molecule AI · core-fe) core-lead (Molecule AI · core-lead) core-offsec (Molecule AI · core-offsec) core-qa (Molecule AI · core-qa) core-security (Molecule AI · core-security) core-uiux (Molecule AI · core-uiux) cp-be (Molecule AI · cp-be) cp-lead (Molecule AI · cp-lead) cp-qa (Molecule AI · cp-qa) cp-security (Molecule AI · cp-security) cui (Zhanlin Cui) dev-lead (Molecule AI · dev-lead) devops-engineer documentation-specialist (Molecule AI · documentation-specialist) fullstack-engineer (Molecule AI · fullstack-engineer) hongming hongming-codex-laptop hongming-kimi-laptop hongming-pc2 infra-lead (Molecule AI · infra-lead) infra-runtime-be (Molecule AI · infra-runtime-be) infra-sre (Molecule AI · infra-sre) integration-tester (Molecule AI · integration-tester) mc-drift-bot plugin-dev (Molecule AI · plugin-dev) pm publish-runtime-bot release-manager (Molecule AI · release-manager) sdk-dev (Molecule AI · sdk-dev) sdk-lead (Molecule AI · sdk-lead) sop-drift-bot sop-tier-bot (SOP Tier-Check Bot) technical-writer (Molecule AI · technical-writer) triage-operator (Molecule AI · triage-operator)

No Assignees

1 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: molecule-ai/molecule-core#1007