From cd8b2ee20463334be4091cfcefc13f5533a7020f Mon Sep 17 00:00:00 2001 From: "Patrik J. Braun" Date: Wed, 17 Dec 2025 16:58:01 +0100 Subject: [PATCH] trying to make mysql tests a bit less flaky --- test/TestHelper.ts | 6 +++--- test/backend/unit/model/sql/IndexingManager.spec.ts | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/TestHelper.ts b/test/TestHelper.ts index bd94fee5..3065e0f6 100644 --- a/test/TestHelper.ts +++ b/test/TestHelper.ts @@ -7,7 +7,7 @@ import { import {PhotoEntity, PhotoMetadataEntity} from '../src/backend/model/database/enitites/PhotoEntity'; import {DirectoryEntity} from '../src/backend/model/database/enitites/DirectoryEntity'; import {VideoEntity, VideoMetadataEntity} from '../src/backend/model/database/enitites/VideoEntity'; -import {MediaDimension, MediaDTO} from '../src/common/entities/MediaDTO'; +import {MediaDimension, MediaDTO, RatingTypes} from '../src/common/entities/MediaDTO'; import { CameraMetadata, CoverPhotoDTO, @@ -363,7 +363,7 @@ export class TestHelper { return f; } - public static getRandomizedPhotoEntry(dir: DirectoryBaseDTO, forceStr: string = null, faces = 2, rating?: number): PhotoDTO { + public static getRandomizedPhotoEntry(dir: DirectoryBaseDTO, forceStr: string = null, faces = 2, rating?: RatingTypes): PhotoDTO { const rndStr = (): string => { @@ -407,7 +407,7 @@ export class TestHelper { creationDateOffset: '+01:00', fileSize: rndInt(10000), caption: rndStr(), - rating: rating ?? rndInt(5) as any + ...(!isNaN(rating) && {rating}) }; diff --git a/test/backend/unit/model/sql/IndexingManager.spec.ts b/test/backend/unit/model/sql/IndexingManager.spec.ts index 82abb463..2df7864d 100644 --- a/test/backend/unit/model/sql/IndexingManager.spec.ts +++ b/test/backend/unit/model/sql/IndexingManager.spec.ts @@ -611,8 +611,8 @@ describe('IndexingManager', (sqlHelper: DBTestHelper) => { const session = DBTestHelper.defaultSession; const parent = TestHelper.getRandomizedDirectoryEntry(); - const p1 = TestHelper.getRandomizedPhotoEntry(parent, 'Photo1'); - const p2 = TestHelper.getRandomizedPhotoEntry(parent, 'Photo2'); + const p1 = TestHelper.getRandomizedPhotoEntry(parent, 'Photo1', 2, 3); + const p2 = TestHelper.getRandomizedPhotoEntry(parent, 'Photo2', 2, 4); DirectoryDTOUtils.removeReferences(parent); await im.saveToDB(Utils.clone(parent) as ParentDirectoryDTO);