From fea11cf25cc584167862083d2879694766ced7fa Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 22 Jul 2021 14:58:25 +0200 Subject: [PATCH] Fix tests with node 16 --- server/tests/api/videos/resumable-upload.ts | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/server/tests/api/videos/resumable-upload.ts b/server/tests/api/videos/resumable-upload.ts index 13e47c85e..a2d60eeec 100644 --- a/server/tests/api/videos/resumable-upload.ts +++ b/server/tests/api/videos/resumable-upload.ts @@ -99,8 +99,8 @@ describe('Test resumable upload', function () { this.timeout(30000) server = await createSingleServer(1) - await setAccessTokensToServers([ server ]) - await setDefaultVideoChannel([ server ]) + await setAccessTokensToServers([server]) + await setDefaultVideoChannel([server]) const body = await server.users.getMyInfo() rootId = body.id @@ -146,8 +146,7 @@ describe('Test resumable upload', function () { }) it('Should not accept more chunks than expected', async function () { - const size = 100 - const uploadId = await prepareUpload(size) + const uploadId = await prepareUpload(100) await sendChunks({ pathUploadId: uploadId, expectedStatus: HttpStatusCode.CONFLICT_409 }) await checkFileSize(uploadId, 0) @@ -156,8 +155,14 @@ describe('Test resumable upload', function () { it('Should not accept more chunks than expected with an invalid content length/content range', async function () { const uploadId = await prepareUpload(1500) - await sendChunks({ pathUploadId: uploadId, expectedStatus: HttpStatusCode.BAD_REQUEST_400, contentLength: 1000 }) - await checkFileSize(uploadId, 0) + // Content length check seems to have changed in v16 + if (process.version.startsWith('v16')) { + await sendChunks({ pathUploadId: uploadId, expectedStatus: HttpStatusCode.CONFLICT_409, contentLength: 1000 }) + await checkFileSize(uploadId, 1000) + } else { + await sendChunks({ pathUploadId: uploadId, expectedStatus: HttpStatusCode.BAD_REQUEST_400, contentLength: 1000 }) + await checkFileSize(uploadId, 0) + } }) it('Should not accept more chunks than expected with an invalid content length', async function () { @@ -166,12 +171,12 @@ describe('Test resumable upload', function () { const size = 1000 const contentRangeBuilder = start => `bytes ${start}-${start + size - 1}/${size}` - await sendChunks({ pathUploadId: uploadId, expectedStatus: HttpStatusCode.BAD_REQUEST_400, contentRangeBuilder, contentLength: size }) + await sendChunks({ pathUploadId: uploadId, expectedStatus: HttpStatusCode.CONFLICT_409, contentRangeBuilder, contentLength: size }) await checkFileSize(uploadId, 0) }) }) after(async function () { - await cleanupTests([ server ]) + await cleanupTests([server]) }) })