Fix tests with node 16

pull/4271/head
Chocobozzz 2021-07-22 14:58:25 +02:00
parent 2e980ed30d
commit fea11cf25c
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
1 changed files with 13 additions and 8 deletions

View File

@ -99,8 +99,8 @@ describe('Test resumable upload', function () {
this.timeout(30000) this.timeout(30000)
server = await createSingleServer(1) server = await createSingleServer(1)
await setAccessTokensToServers([ server ]) await setAccessTokensToServers([server])
await setDefaultVideoChannel([ server ]) await setDefaultVideoChannel([server])
const body = await server.users.getMyInfo() const body = await server.users.getMyInfo()
rootId = body.id rootId = body.id
@ -146,8 +146,7 @@ describe('Test resumable upload', function () {
}) })
it('Should not accept more chunks than expected', async function () { it('Should not accept more chunks than expected', async function () {
const size = 100 const uploadId = await prepareUpload(100)
const uploadId = await prepareUpload(size)
await sendChunks({ pathUploadId: uploadId, expectedStatus: HttpStatusCode.CONFLICT_409 }) await sendChunks({ pathUploadId: uploadId, expectedStatus: HttpStatusCode.CONFLICT_409 })
await checkFileSize(uploadId, 0) 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 () { it('Should not accept more chunks than expected with an invalid content length/content range', async function () {
const uploadId = await prepareUpload(1500) const uploadId = await prepareUpload(1500)
// 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 sendChunks({ pathUploadId: uploadId, expectedStatus: HttpStatusCode.BAD_REQUEST_400, contentLength: 1000 })
await checkFileSize(uploadId, 0) await checkFileSize(uploadId, 0)
}
}) })
it('Should not accept more chunks than expected with an invalid content length', async function () { 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 size = 1000
const contentRangeBuilder = start => `bytes ${start}-${start + size - 1}/${size}` 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) await checkFileSize(uploadId, 0)
}) })
}) })
after(async function () { after(async function () {
await cleanupTests([ server ]) await cleanupTests([server])
}) })
}) })