diff options
Diffstat (limited to 'server')
-rw-r--r-- | server/tests/api/videos/resumable-upload.ts | 41 |
1 files changed, 34 insertions, 7 deletions
diff --git a/server/tests/api/videos/resumable-upload.ts b/server/tests/api/videos/resumable-upload.ts index d6f4da630..b6d70ed44 100644 --- a/server/tests/api/videos/resumable-upload.ts +++ b/server/tests/api/videos/resumable-upload.ts | |||
@@ -5,6 +5,7 @@ import * as chai from 'chai' | |||
5 | import { pathExists, readdir, stat } from 'fs-extra' | 5 | import { pathExists, readdir, stat } from 'fs-extra' |
6 | import { join } from 'path' | 6 | import { join } from 'path' |
7 | import { buildAbsoluteFixturePath } from '@shared/core-utils' | 7 | import { buildAbsoluteFixturePath } from '@shared/core-utils' |
8 | import { sha1 } from '@shared/extra-utils' | ||
8 | import { HttpStatusCode, VideoPrivacy } from '@shared/models' | 9 | import { HttpStatusCode, VideoPrivacy } from '@shared/models' |
9 | import { cleanupTests, createSingleServer, PeerTubeServer, setAccessTokensToServers, setDefaultVideoChannel } from '@shared/server-commands' | 10 | import { cleanupTests, createSingleServer, PeerTubeServer, setAccessTokensToServers, setDefaultVideoChannel } from '@shared/server-commands' |
10 | 11 | ||
@@ -59,8 +60,9 @@ describe('Test resumable upload', function () { | |||
59 | contentLength?: number | 60 | contentLength?: number |
60 | contentRange?: string | 61 | contentRange?: string |
61 | contentRangeBuilder?: (start: number, chunk: any) => string | 62 | contentRangeBuilder?: (start: number, chunk: any) => string |
63 | digestBuilder?: (chunk: any) => string | ||
62 | }) { | 64 | }) { |
63 | const { token, pathUploadId, expectedStatus, contentLength, contentRangeBuilder } = options | 65 | const { token, pathUploadId, expectedStatus, contentLength, contentRangeBuilder, digestBuilder } = options |
64 | 66 | ||
65 | const size = await buildSize(defaultFixture, options.size) | 67 | const size = await buildSize(defaultFixture, options.size) |
66 | const absoluteFilePath = buildAbsoluteFixturePath(defaultFixture) | 68 | const absoluteFilePath = buildAbsoluteFixturePath(defaultFixture) |
@@ -72,6 +74,7 @@ describe('Test resumable upload', function () { | |||
72 | size, | 74 | size, |
73 | contentLength, | 75 | contentLength, |
74 | contentRangeBuilder, | 76 | contentRangeBuilder, |
77 | digestBuilder, | ||
75 | expectedStatus | 78 | expectedStatus |
76 | }) | 79 | }) |
77 | } | 80 | } |
@@ -122,13 +125,14 @@ describe('Test resumable upload', function () { | |||
122 | 125 | ||
123 | describe('Directory cleaning', function () { | 126 | describe('Directory cleaning', function () { |
124 | 127 | ||
125 | it('Should correctly delete files after an upload', async function () { | 128 | // FIXME: https://github.com/kukhariev/node-uploadx/pull/524/files#r852989382 |
126 | const uploadId = await prepareUpload() | 129 | // it('Should correctly delete files after an upload', async function () { |
127 | await sendChunks({ pathUploadId: uploadId }) | 130 | // const uploadId = await prepareUpload() |
128 | await server.videos.endResumableUpload({ pathUploadId: uploadId }) | 131 | // await sendChunks({ pathUploadId: uploadId }) |
132 | // await server.videos.endResumableUpload({ pathUploadId: uploadId }) | ||
129 | 133 | ||
130 | expect(await countResumableUploads()).to.equal(0) | 134 | // expect(await countResumableUploads()).to.equal(0) |
131 | }) | 135 | // }) |
132 | 136 | ||
133 | it('Should not delete files after an unfinished upload', async function () { | 137 | it('Should not delete files after an unfinished upload', async function () { |
134 | await prepareUpload() | 138 | await prepareUpload() |
@@ -252,6 +256,29 @@ describe('Test resumable upload', function () { | |||
252 | const result2 = await sendChunks({ pathUploadId: uploadId1 }) | 256 | const result2 = await sendChunks({ pathUploadId: uploadId1 }) |
253 | expect(result2.headers['x-resumable-upload-cached']).to.not.exist | 257 | expect(result2.headers['x-resumable-upload-cached']).to.not.exist |
254 | }) | 258 | }) |
259 | |||
260 | it('Should refuse an invalid digest', async function () { | ||
261 | const uploadId = await prepareUpload({ token: server.accessToken }) | ||
262 | |||
263 | await sendChunks({ | ||
264 | pathUploadId: uploadId, | ||
265 | token: server.accessToken, | ||
266 | digestBuilder: () => 'sha=' + 'a'.repeat(40), | ||
267 | expectedStatus: 460 | ||
268 | }) | ||
269 | }) | ||
270 | |||
271 | it('Should accept an appropriate digest', async function () { | ||
272 | const uploadId = await prepareUpload({ token: server.accessToken }) | ||
273 | |||
274 | await sendChunks({ | ||
275 | pathUploadId: uploadId, | ||
276 | token: server.accessToken, | ||
277 | digestBuilder: (chunk: Buffer) => { | ||
278 | return 'sha1=' + sha1(chunk, 'base64') | ||
279 | } | ||
280 | }) | ||
281 | }) | ||
255 | }) | 282 | }) |
256 | 283 | ||
257 | after(async function () { | 284 | after(async function () { |