From 5a37385afb923d158ce901e0762a6b39cf8d17fb Mon Sep 17 00:00:00 2001 From: Yuki Hattori Date: Tue, 21 Jan 2025 21:21:19 +0900 Subject: [PATCH] Improve flaky tests about JPEG conversion Update `imageScale` option for testing to reduce memory usage. --- .circleci/config.yml | 2 +- .github/workflows/test-win.yml | 2 +- test/converter.ts | 22 +++++++++++----------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6f6b354a..1b55c633 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -97,7 +97,7 @@ commands: steps: - run: name: Jest - command: npm run test:coverage -- --ci --reporters=default --reporters=jest-junit <<# parameters.runInBand >>-i<> + command: npm run test:coverage -- --ci --maxWorkers=2 --reporters=default --reporters=jest-junit <<# parameters.runInBand >>-i<> environment: JEST_JUNIT_CLASSNAME: '{filepath}' JEST_JUNIT_OUTPUT_DIR: tmp/test-results diff --git a/.github/workflows/test-win.yml b/.github/workflows/test-win.yml index 967dd6de..02ad3a06 100644 --- a/.github/workflows/test-win.yml +++ b/.github/workflows/test-win.yml @@ -53,7 +53,7 @@ jobs: MARP_TEST_CI: 1 run: >- npm run test:coverage -- --ci --max-workers ${{ steps.cpu-cores.outputs.count }} --reporters=default --reporters=jest-junit || - npm run test:coverage -- --ci --bail -i --reporters=default --reporters=jest-junit --no-cache || + npm run test:coverage -- --ci --bail -i --reporters=default --reporters=jest-junit || npm run test:coverage -- --ci --bail -i --reporters=default --reporters=jest-junit --no-cache || npm run test:coverage -- --ci --bail -i --reporters=default --reporters=jest-junit --no-cache diff --git a/test/converter.ts b/test/converter.ts index c6eb6231..a530373a 100644 --- a/test/converter.ts +++ b/test/converter.ts @@ -1287,7 +1287,7 @@ describe('Converter', () => { await instance({ output: 'b.jpg', type: ConvertType.jpeg, - imageScale: 0.5, + imageScale: 0.25, }).convertFile(new File(onePath)) expect(writeFileSpy.mock.calls[0][1]).toBeInstanceOf(Buffer) @@ -1295,8 +1295,8 @@ describe('Converter', () => { const jpeg = writeFileSpy.mock.calls[0][1] as Buffer const { width, height } = imageSize(jpeg) - expect(width).toBe(640) - expect(height).toBe(360) + expect(width).toBe(320) + expect(height).toBe(180) }, timeoutLarge ) @@ -1309,14 +1309,14 @@ describe('Converter', () => { await using browserManager = new BrowserManager({ finders: ['chrome', 'edge'], protocol: 'webDriverBiDi', - timeout, + timeout: timeoutLarge, }) await instance({ browserManager, output: 'b.jpg', type: ConvertType.jpeg, - imageScale: 0.5, + imageScale: 0.25, }).convertFile(new File(onePath)) const [lastCall] = writeFileSpy.mock.calls.slice(-1) @@ -1325,8 +1325,8 @@ describe('Converter', () => { const jpeg = lastCall[1] as Buffer const { width, height } = imageSize(jpeg) - expect(width).toBe(640) - expect(height).toBe(360) + expect(width).toBe(320) + expect(height).toBe(180) // Check JPEG quality is working writeFileSpy.mockClear() @@ -1353,14 +1353,14 @@ describe('Converter', () => { async () => { await using browserManager = new BrowserManager({ finders: ['firefox'], - timeout, + timeout: timeoutLarge, }) await instance({ browserManager, output: 'b.jpg', type: ConvertType.jpeg, - imageScale: 0.5, + imageScale: 0.25, }).convertFile(new File(onePath)) const [lastCall] = writeFileSpy.mock.calls.slice(-1) @@ -1369,8 +1369,8 @@ describe('Converter', () => { const jpeg = lastCall[1] as Buffer const { width, height } = imageSize(jpeg) - expect(width).toBe(640) - expect(height).toBe(360) + expect(width).toBe(320) + expect(height).toBe(180) // Check JPEG quality is working writeFileSpy.mockClear()