From cf6dcd77fb4e1452211e341d919cf144e050b386 Mon Sep 17 00:00:00 2001 From: Denozordec Date: Sun, 15 Nov 2026 21:13:52 +0700 Subject: [PATCH] =?UTF-8?q?fix(test):=20=D1=81=D0=B8=D0=BD=D1=85=D1=80?= =?UTF-8?q?=D0=BE=D0=BD=D0=B8=D0=B7=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D1=82?= =?UTF-8?q?=D1=8C=20=D0=B7=D0=B0=D0=B3=D0=BB=D1=83=D1=88=D0=BA=D0=B8=20?= =?UTF-8?q?=D1=82=D0=B5=D1=81=D1=82=D0=B0=20=D0=BF=D0=BB=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D1=80=D0=BE=D0=B2=D1=89=D0=B8=D0=BA=D0=B0=20=D0=B8=20=D0=BF?= =?UTF-8?q?=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=D0=B0=20lint?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Тест scheduler-automatic-root отстал от исходников: не хватало заглушек карантина восстановления, общего шлюза БД и проверки активации. ESLint больше не обходит локальные каталоги tmp, сгенерированный .ci/docker и dist-*, ошибки Codex в новых скриптах и тестах устранены. Co-Authored-By: Claude Sonnet 5.5 --- backend/scripts/acceptance/s3-ui-limited-restore.cjs | 1 + .../scripts/database-writer-profile-operator.test.mts | 1 + backend/scripts/test-flow-read-adapters.mjs | 1 + backend/src/routes/system-database.test.ts | 3 ++- backend/src/services/ros-metric-parse.ts | 2 +- backend/src/services/scheduler-automatic-root.test.mjs | 7 +++++-- .../src/services/server-poll-durable-session.sql.test.ts | 2 +- backend/src/services/statistics-aggregate.ts | 2 +- eslint.config.mjs | 9 +++++++++ 9 files changed, 22 insertions(+), 6 deletions(-) diff --git a/backend/scripts/acceptance/s3-ui-limited-restore.cjs b/backend/scripts/acceptance/s3-ui-limited-restore.cjs index dc0e2919..03590b67 100644 --- a/backend/scripts/acceptance/s3-ui-limited-restore.cjs +++ b/backend/scripts/acceptance/s3-ui-limited-restore.cjs @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/no-require-imports -- standalone CommonJS Playwright script */ const fs = require('fs'), assert = require('node:assert/strict'), { createHash } = require('crypto'); const { chromium, expect } = require('@playwright/test'); (async () => { diff --git a/backend/scripts/database-writer-profile-operator.test.mts b/backend/scripts/database-writer-profile-operator.test.mts index 22b51861..e24e3b5a 100644 --- a/backend/scripts/database-writer-profile-operator.test.mts +++ b/backend/scripts/database-writer-profile-operator.test.mts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/no-explicit-any -- loosely typed fixtures in an operator test */ import test from 'node:test' import assert from 'node:assert/strict' import {generateKeyPairSync,createHash,X509Certificate,sign} from 'node:crypto' diff --git a/backend/scripts/test-flow-read-adapters.mjs b/backend/scripts/test-flow-read-adapters.mjs index 6fc03436..a3206a16 100644 --- a/backend/scripts/test-flow-read-adapters.mjs +++ b/backend/scripts/test-flow-read-adapters.mjs @@ -5,6 +5,7 @@ import { createRequire } from 'node:module' import { resolve } from 'node:path' const require=createRequire(import.meta.url),zod=require('zod'),here=import.meta.dirname function evaluate(source,mocks={}){ + // eslint-disable-next-line @next/next/no-assign-module-variable -- CommonJS wrapper emulation const exports={},module={exports} const code=ts.transpileModule(source,{compilerOptions:{module:ts.ModuleKind.CommonJS,target:ts.ScriptTarget.ES2022}}).outputText new Function('require','exports','module',code)(id=>{if(id==='zod')return zod;if(Object.hasOwn(mocks,id))return mocks[id];throw Error('Unexpected dependency '+id)},exports,module) diff --git a/backend/src/routes/system-database.test.ts b/backend/src/routes/system-database.test.ts index fae48455..3fa55c0e 100644 --- a/backend/src/routes/system-database.test.ts +++ b/backend/src/routes/system-database.test.ts @@ -5,6 +5,7 @@ import {withOperationLock} from "../db/operation-lock.js" const app=Fastify(),dump=Buffer.from("PGDMPfixture") let exports=0,restores=0,events=0,eventFails=true,coreFails=false,held=false let unavailableCode: string | undefined +// eslint-disable-next-line prefer-const -- assigned once later, but read by routes registered before that line let maintenanceError: string | undefined, lastEventTitle: string | undefined let gate:Promise|undefined let entered:(()=>void)|undefined @@ -14,7 +15,7 @@ const refuseUnavailable = () => { } await app.register(createSystemDatabaseRoutes({exportBackup:async()=>{exports++;refuseUnavailable();if(coreFails)throw Error("dump failed");return {filename:"fixture.dump",buffer:dump,listenerError:"listener warning"}},restoreBackup:async()=>withOperationLock(lock,1,async()=>{restores++;entered?.();if(gate)await gate;refuseUnavailable();if(coreFails)throw Error("restore failed");return {schedulerError:"scheduler warning",cleanupError:"cleanup warning",maintenanceError}},"Операция с базой приложения уже выполняется"),event:async input=>{events++;lastEventTitle=input.title;if(eventFails)throw Error("event fixture secret");return undefined as never}}),{prefix:"/api"}) const restore=()=>app.inject({method:"POST",url:"/api/system/database/restore",headers:{"content-type":"application/octet-stream"},payload:dump}) -let response=await app.inject({method:"GET",url:"/api/system/database/backup"});assert.equal(response.statusCode,200);assert.deepEqual(response.rawPayload,dump);let warnings=JSON.parse(decodeURIComponent(response.headers["x-system-database-outcome"] as string));assert.equal(warnings.listenerError,"listener warning");assert.match(warnings.eventError,/событие/);assert.equal(response.body.includes("secret"),false) +let response=await app.inject({method:"GET",url:"/api/system/database/backup"});assert.equal(response.statusCode,200);assert.deepEqual(response.rawPayload,dump);const warnings=JSON.parse(decodeURIComponent(response.headers["x-system-database-outcome"] as string));assert.equal(warnings.listenerError,"listener warning");assert.match(warnings.eventError,/событие/);assert.equal(response.body.includes("secret"),false) response=await restore();assert.equal(response.statusCode,200);assert.equal(response.json().ok,true);assert.equal(response.json().cleanupError,"cleanup warning");assert.match(response.json().eventError,/событие/) coreFails=true;const before=events;response=await restore();assert.equal(response.statusCode,400);assert.equal(response.json().ok,undefined);assert.equal(events,before);response=await app.inject({method:"GET",url:"/api/system/database/backup"});assert.equal(response.statusCode,500);assert.equal(events,before) coreFails=false;eventFails=false;let release!:()=>void;gate=new Promise(resolve=>release=resolve);const started=new Promise(resolve=>entered=resolve);const first=restore();await started;const runs=restores;response=await restore();assert.equal(response.statusCode,409);assert.equal(restores,runs);release();assert.equal((await first).statusCode,200);gate=undefined diff --git a/backend/src/services/ros-metric-parse.ts b/backend/src/services/ros-metric-parse.ts index c344ef1c..9ec7e080 100644 --- a/backend/src/services/ros-metric-parse.ts +++ b/backend/src/services/ros-metric-parse.ts @@ -6,7 +6,7 @@ export function parseRosDataSizeBytes(raw: unknown): number { if (raw == null) return 0 if (typeof raw === "number" && Number.isFinite(raw)) return Math.max(0, Math.floor(raw)) - let s = String(raw).trim().replace(/\s+/g, "") + const s = String(raw).trim().replace(/\s+/g, "") if (!s) return 0 if (/^\d+$/.test(s)) { const n = Number.parseInt(s, 10) diff --git a/backend/src/services/scheduler-automatic-root.test.mjs b/backend/src/services/scheduler-automatic-root.test.mjs index c1d57ba0..de8e3367 100644 --- a/backend/src/services/scheduler-automatic-root.test.mjs +++ b/backend/src/services/scheduler-automatic-root.test.mjs @@ -29,7 +29,10 @@ test("fixed scheduler ownership: real ALS/AsyncResource, fake I/O", async t => { const leaseState = { holders: 0, checkouts: 0, maintenance: false } const leases = load(await source("modules/mcp/database-request-lease.ts"), { "node:async_hooks": asyncProvider, "../../db/operation-lock.js": requestLock, "./security.js": { McpError }, - "../../db/index.js": { createPool: () => ({ on() {}, async connect() { + "../../services/shared-database-gate.js": { sharedDatabaseGate: databaseGate }, + // Restore quarantine is out of scope for scheduler ownership; disabled means the lease never checks it. + "../../db/database-restore-quarantine.js": { databaseRestoreQuarantineEnabled: () => false, assertDatabaseRestoreQuarantineOpen: async () => { throw new Error("quarantine must not be consulted") } }, + "../../db/index.js": { assertRuntimeDatabaseActivationCurrent() {}, createPool: () => ({ on() {}, async connect() { assert(databaseGate.active.size > 0, "SQL admission follows the local request gate") leaseState.checkouts++ const client = new EventEmitter() @@ -49,7 +52,7 @@ test("fixed scheduler ownership: real ALS/AsyncResource, fake I/O", async t => { return client } }) }, }) - const locks = load(await source("services/config-mutation-lock.ts"), { "node:async_hooks": asyncProvider, "../db/index.js": { pool: freshPool }, "../db/operation-lock.js": requestLock, "../modules/mcp/security.js": { McpError }, "../modules/mcp/database-request-lease.js": leases, "./operation-config-lock-lease.js": op }) + const locks = load(await source("services/config-mutation-lock.ts"), { "node:async_hooks": asyncProvider, "../db/index.js": { assertRuntimeDatabaseActivationCurrent() {}, pool: freshPool }, "../db/operation-lock.js": requestLock, "../db/database-restore-quarantine.js": { databaseRestoreQuarantineEnabled: () => false, assertDatabaseRestoreQuarantineOpen: async () => { throw new Error("quarantine must not be consulted") } }, "../modules/mcp/security.js": { McpError }, "../modules/mcp/database-request-lease.js": leases, "./operation-config-lock-lease.js": op }) const policy = load(await source("services/config-mutation-policy.ts"), { "node:async_hooks": asyncProvider, "node:crypto": require("node:crypto"), "node:perf_hooks": require("node:perf_hooks"), "node:util": require("node:util"), "../db/index.js": { pool: freshPool }, "../modules/mcp/store.js": { audit: async () => { throw Error("Unexpected audit I/O") } }, "../modules/mcp/security.js": { McpError }, "./config-mutation-lock.js": locks, "../modules/mcp/routing-controller-active-writer.js": { assertActiveRoutingProfileWriter: async () => { throw Error("Unexpected native writer in fake scheduler collectors") } } }) diff --git a/backend/src/services/server-poll-durable-session.sql.test.ts b/backend/src/services/server-poll-durable-session.sql.test.ts index 91791c32..9a2ae641 100644 --- a/backend/src/services/server-poll-durable-session.sql.test.ts +++ b/backend/src/services/server-poll-durable-session.sql.test.ts @@ -208,7 +208,7 @@ try{ try{ Client.prototype.query=function(this:InstanceType,...args:unknown[]){ const request=args[0] as {text?:string;values?:unknown[]} - if(request?.text?.startsWith("INSERT INTO server_poll_storage_admissions")&&request.values?.[0]===lostRequest.receiptId)reservedBackend=this + if(request?.text?.startsWith("INSERT INTO server_poll_storage_admissions")&&request.values?.[0]===lostRequest.receiptId)reservedBackend=this /* eslint-disable-line @typescript-eslint/no-this-alias */ if(this===reservedBackend&&request?.text==="COMMIT"&&acksLost===0){ return Promise.resolve(Reflect.apply(originalQuery,this,args)).then((result:{command:string})=>{ assert.equal(result.command,"COMMIT");acksLost++;throw Error("owned real reservation COMMIT ACK lost") diff --git a/backend/src/services/statistics-aggregate.ts b/backend/src/services/statistics-aggregate.ts index 7314e468..c3ff14b0 100644 --- a/backend/src/services/statistics-aggregate.ts +++ b/backend/src/services/statistics-aggregate.ts @@ -489,7 +489,7 @@ export async function getStatistics(query: StatisticsQuery): Promise = [] + const dupeIfaceRows: Array<{ serverId: number; iface: string; bytes: number; packets: number; kind: "wan" | "overlay" }> = [] if (ctx.planes === "all" && !ctx.iface) { const wanWhere = factWhere("f", period.grain, ctx, "wan") const overlayWhere = factWhere("f", period.grain, ctx, "overlay") diff --git a/eslint.config.mjs b/eslint.config.mjs index 2c9b1e9f..4de73eb6 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -10,6 +10,15 @@ const eslintConfig = defineConfig([ "out/**", "build/**", "backend/dist/**", + // Local scratch and disposable build outputs; some contain unreadable directories. + "tmp/**", + "tmp-*", + "tmp-*/**", + ".next-*/**", + "backend/dist-*/**", + ".serena/**", + ".claude/worktrees/**", + ".ci/docker/**", "next-env.d.ts", ]), {