fix(test): синхронизировать заглушки теста планировщика и правила lint
Тест scheduler-automatic-root отстал от исходников: не хватало заглушек карантина восстановления, общего шлюза БД и проверки активации. ESLint больше не обходит локальные каталоги tmp, сгенерированный .ci/docker и dist-*, ошибки Codex в новых скриптах и тестах устранены. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
eec070d2d6
commit
cf6dcd77fb
9 files changed
+22
-6
No files matched your search
@@ -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 fs = require('fs'), assert = require('node:assert/strict'), { createHash } = require('crypto');
|
||||||
const { chromium, expect } = require('@playwright/test');
|
const { chromium, expect } = require('@playwright/test');
|
||||||
(async () => {
|
(async () => {
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
/* eslint-disable @typescript-eslint/no-explicit-any -- loosely typed fixtures in an operator test */
|
||||||
import test from 'node:test'
|
import test from 'node:test'
|
||||||
import assert from 'node:assert/strict'
|
import assert from 'node:assert/strict'
|
||||||
import {generateKeyPairSync,createHash,X509Certificate,sign} from 'node:crypto'
|
import {generateKeyPairSync,createHash,X509Certificate,sign} from 'node:crypto'
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import { createRequire } from 'node:module'
|
|||||||
import { resolve } from 'node:path'
|
import { resolve } from 'node:path'
|
||||||
const require=createRequire(import.meta.url),zod=require('zod'),here=import.meta.dirname
|
const require=createRequire(import.meta.url),zod=require('zod'),here=import.meta.dirname
|
||||||
function evaluate(source,mocks={}){
|
function evaluate(source,mocks={}){
|
||||||
|
// eslint-disable-next-line @next/next/no-assign-module-variable -- CommonJS wrapper emulation
|
||||||
const exports={},module={exports}
|
const exports={},module={exports}
|
||||||
const code=ts.transpileModule(source,{compilerOptions:{module:ts.ModuleKind.CommonJS,target:ts.ScriptTarget.ES2022}}).outputText
|
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)
|
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)
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import {withOperationLock} from "../db/operation-lock.js"
|
|||||||
const app=Fastify(),dump=Buffer.from("PGDMPfixture")
|
const app=Fastify(),dump=Buffer.from("PGDMPfixture")
|
||||||
let exports=0,restores=0,events=0,eventFails=true,coreFails=false,held=false
|
let exports=0,restores=0,events=0,eventFails=true,coreFails=false,held=false
|
||||||
let unavailableCode: string | undefined
|
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 maintenanceError: string | undefined, lastEventTitle: string | undefined
|
||||||
let gate:Promise<void>|undefined
|
let gate:Promise<void>|undefined
|
||||||
let entered:(()=>void)|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"})
|
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})
|
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,/событие/)
|
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=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<void>(resolve=>release=resolve);const started=new Promise<void>(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
|
coreFails=false;eventFails=false;let release!:()=>void;gate=new Promise<void>(resolve=>release=resolve);const started=new Promise<void>(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
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
export function parseRosDataSizeBytes(raw: unknown): number {
|
export function parseRosDataSizeBytes(raw: unknown): number {
|
||||||
if (raw == null) return 0
|
if (raw == null) return 0
|
||||||
if (typeof raw === "number" && Number.isFinite(raw)) return Math.max(0, Math.floor(raw))
|
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 (!s) return 0
|
||||||
if (/^\d+$/.test(s)) {
|
if (/^\d+$/.test(s)) {
|
||||||
const n = Number.parseInt(s, 10)
|
const n = Number.parseInt(s, 10)
|
||||||
|
|||||||
@@ -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 leaseState = { holders: 0, checkouts: 0, maintenance: false }
|
||||||
const leases = load(await source("modules/mcp/database-request-lease.ts"), {
|
const leases = load(await source("modules/mcp/database-request-lease.ts"), {
|
||||||
"node:async_hooks": asyncProvider, "../../db/operation-lock.js": requestLock, "./security.js": { McpError },
|
"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")
|
assert(databaseGate.active.size > 0, "SQL admission follows the local request gate")
|
||||||
leaseState.checkouts++
|
leaseState.checkouts++
|
||||||
const client = new EventEmitter()
|
const client = new EventEmitter()
|
||||||
@@ -49,7 +52,7 @@ test("fixed scheduler ownership: real ALS/AsyncResource, fake I/O", async t => {
|
|||||||
return client
|
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"),
|
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,
|
"../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") } } })
|
"../modules/mcp/routing-controller-active-writer.js": { assertActiveRoutingProfileWriter: async () => { throw Error("Unexpected native writer in fake scheduler collectors") } } })
|
||||||
|
|||||||
@@ -208,7 +208,7 @@ try{
|
|||||||
try{
|
try{
|
||||||
Client.prototype.query=function(this:InstanceType<typeof Client>,...args:unknown[]){
|
Client.prototype.query=function(this:InstanceType<typeof Client>,...args:unknown[]){
|
||||||
const request=args[0] as {text?:string;values?: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){
|
if(this===reservedBackend&&request?.text==="COMMIT"&&acksLost===0){
|
||||||
return Promise.resolve(Reflect.apply(originalQuery,this,args)).then((result:{command:string})=>{
|
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")
|
assert.equal(result.command,"COMMIT");acksLost++;throw Error("owned real reservation COMMIT ACK lost")
|
||||||
|
|||||||
@@ -489,7 +489,7 @@ export async function getStatistics(query: StatisticsQuery): Promise<StatisticsD
|
|||||||
})
|
})
|
||||||
const ifaceCount = ifaceRows.length
|
const ifaceCount = ifaceRows.length
|
||||||
|
|
||||||
let dupeIfaceRows: Array<{ serverId: number; iface: string; bytes: number; packets: number; kind: "wan" | "overlay" }> = []
|
const dupeIfaceRows: Array<{ serverId: number; iface: string; bytes: number; packets: number; kind: "wan" | "overlay" }> = []
|
||||||
if (ctx.planes === "all" && !ctx.iface) {
|
if (ctx.planes === "all" && !ctx.iface) {
|
||||||
const wanWhere = factWhere("f", period.grain, ctx, "wan")
|
const wanWhere = factWhere("f", period.grain, ctx, "wan")
|
||||||
const overlayWhere = factWhere("f", period.grain, ctx, "overlay")
|
const overlayWhere = factWhere("f", period.grain, ctx, "overlay")
|
||||||
|
|||||||
@@ -10,6 +10,15 @@ const eslintConfig = defineConfig([
|
|||||||
"out/**",
|
"out/**",
|
||||||
"build/**",
|
"build/**",
|
||||||
"backend/dist/**",
|
"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",
|
"next-env.d.ts",
|
||||||
]),
|
]),
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in new issue
Block a user