From 9ef38dc08762870c51f27f86ff6197b1d8262bf5 Mon Sep 17 00:00:00 2001 From: Denozordec Date: Sat, 21 Nov 2026 23:06:24 +0700 Subject: [PATCH] =?UTF-8?q?fix(ci):=20=D0=BE=D0=B1=D1=8F=D0=B7=D0=B0=D1=82?= =?UTF-8?q?=D0=B5=D0=BB=D1=8C=D0=BD=D1=8B=D0=B5=20SQL-=D0=BF=D1=80=D0=BE?= =?UTF-8?q?=D0=B2=D0=B5=D1=80=D0=BA=D0=B8=20=D1=81=D0=B5=D1=80=D0=B2=D0=B5?= =?UTF-8?q?=D1=80=D0=B0=20=D1=82=D0=BE=D0=BB=D1=8C=D0=BA=D0=BE=20=D0=B2=20?= =?UTF-8?q?=D1=81=D0=BE=D0=B1=D1=81=D1=82=D0=B2=D0=B5=D0=BD=D0=BD=D0=BE?= =?UTF-8?q?=D0=B9=20=D1=80=D0=B5=D0=B3=D1=80=D0=B5=D1=81=D1=81=D0=B8=D0=B8?= =?UTF-8?q?=20PostgreSQL?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit network-disabled-server.test.ts требовал собственную базу при REQUIRE_TEST_POSTGRES=1, но этот флаг ставит и CI, где база общая и собственной нет: backend-test в main падал. Обязательность теперь задаёт отдельный флаг MMAPP_OWN_REGRESSION, который выставляет только test-mcp-postgres.mjs; без собственной базы SQL-часть пропускается, как до слияния. Co-Authored-By: Claude Opus 5.5 --- backend/scripts/test-mcp-postgres.mjs | 2 +- backend/src/services/network-disabled-server.test.ts | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/backend/scripts/test-mcp-postgres.mjs b/backend/scripts/test-mcp-postgres.mjs index 1b4defb5..2c763847 100644 --- a/backend/scripts/test-mcp-postgres.mjs +++ b/backend/scripts/test-mcp-postgres.mjs @@ -394,7 +394,7 @@ try { DATABASE_URL: `postgresql://mcp_test:${password}@127.0.0.1:${port}/${database}`, DATABASE_PATH: join(directory, 'no-legacy-database.sqlite'), SQLITE_IMPORT_FULL_HISTORY: 'false', MMAPP_OWN_SQL_DB: database, MCP_STATE_DIR: join(directory, 'regression-state'), - REQUIRE_TEST_POSTGRES: '1', + REQUIRE_TEST_POSTGRES: '1', MMAPP_OWN_REGRESSION: '1', LOGS_PERFORMANCE: process.argv.includes('--performance') ? '1' : '0', AUTH_REQUIRED: 'false', NODE_ENV: 'test' }, }) diff --git a/backend/src/services/network-disabled-server.test.ts b/backend/src/services/network-disabled-server.test.ts index e6343ce6..c13e9842 100644 --- a/backend/src/services/network-disabled-server.test.ts +++ b/backend/src/services/network-disabled-server.test.ts @@ -90,7 +90,8 @@ try { finally { if (ownedIds.length) await pool.query("DELETE FROM servers WHERE id=ANY($1::bigint[])", [ownedIds]) } } } else { - assert.notEqual(process.env.REQUIRE_TEST_POSTGRES, "1", "Owned SQL/disabled API checks are mandatory in PostgreSQL regression") + // Only the owned regression (test-mcp-postgres.mjs) must run them; CI has PostgreSQL but no owned database. + assert.notEqual(process.env.MMAPP_OWN_REGRESSION, "1", "Owned SQL/disabled API checks are mandatory in the owned PostgreSQL regression") console.log("network-disabled-server.test.ts: invalid IDs passed; optional SQL checks need an explicit owned database") } } finally { await closePool() }