From 0883ac2d820c8536681f204eeb7ef2668adc524a Mon Sep 17 00:00:00 2001 From: Nicolas Meienberger Date: Mon, 20 Apr 2026 19:42:21 +0200 Subject: [PATCH] chore: fix ci --- .../backups.service.execution.test.ts | 2 +- .../backups/__tests__/backups.service.test.ts | 27 +++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/app/server/modules/backups/__tests__/backups.service.execution.test.ts b/app/server/modules/backups/__tests__/backups.service.execution.test.ts index 5cbcf6b2..9dedf873 100644 --- a/app/server/modules/backups/__tests__/backups.service.execution.test.ts +++ b/app/server/modules/backups/__tests__/backups.service.execution.test.ts @@ -52,7 +52,7 @@ const setup = () => { const ensureHealthyVolumeMock = vi.spyOn(volumeService, "ensureHealthyVolume").mockImplementation(async (shortId) => { const volume = await db.query.volumesTable.findFirst({ where: { - AND: [{ shortId }, { organizationId: TEST_ORG_ID }], + AND: [{ shortId: { eq: shortId } }, { organizationId: TEST_ORG_ID }], }, }); diff --git a/app/server/modules/backups/__tests__/backups.service.test.ts b/app/server/modules/backups/__tests__/backups.service.test.ts index 6d6c0185..8b927e44 100644 --- a/app/server/modules/backups/__tests__/backups.service.test.ts +++ b/app/server/modules/backups/__tests__/backups.service.test.ts @@ -17,6 +17,8 @@ import { repositoriesService } from "~/server/modules/repositories/repositories. import { agentManager } from "~/server/modules/agents/agents-manager"; import { createAgentBackupMocks } from "~/test/helpers/agent-mock"; import { getScheduleByIdOrShortId } from "../helpers/backup-schedule-lookups"; +import { volumeService } from "~/server/modules/volumes/volume.service"; +import { NotFoundError } from "http-errors-enhanced"; const setup = () => { const resticBackupMock = vi.fn((_: SafeSpawnParams) => Promise.resolve({ exitCode: 0, summary: "", error: "" })); @@ -36,6 +38,31 @@ const setup = () => { vi.spyOn(agentManager, "runBackup").mockImplementation(runBackupMock); vi.spyOn(agentManager, "cancelBackup").mockImplementation(cancelBackupMock); vi.spyOn(context, "getOrganizationId").mockReturnValue(TEST_ORG_ID); + vi.spyOn(volumeService, "ensureHealthyVolume").mockImplementation(async (shortId) => { + const volume = await db.query.volumesTable.findFirst({ + where: { + AND: [{ shortId: { eq: shortId } }, { organizationId: TEST_ORG_ID }], + }, + }); + + if (!volume) { + throw new NotFoundError("Volume not found"); + } + + if (volume.status !== "mounted") { + return { + ready: false as const, + volume, + reason: "Volume is not mounted", + }; + } + + return { + ready: true as const, + volume, + remounted: false, + }; + }); return { resticBackupMock,