diff options
author | Chocobozzz <me@florianbigard.com> | 2019-04-26 08:50:52 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2019-05-15 15:14:21 +0200 |
commit | 48f07b4a4091cb10dc4d179118e155f3a118dca8 (patch) | |
tree | 8fcc6bd8cafa636ebaf97a083fafbcc0d52ad5cd /shared/extra-utils/videos | |
parent | 7243f84db0f34c6d5610a54603b0cce7c284a7b3 (diff) | |
download | PeerTube-48f07b4a4091cb10dc4d179118e155f3a118dca8.tar.gz PeerTube-48f07b4a4091cb10dc4d179118e155f3a118dca8.tar.zst PeerTube-48f07b4a4091cb10dc4d179118e155f3a118dca8.zip |
All API tests in parallel
Diffstat (limited to 'shared/extra-utils/videos')
-rw-r--r-- | shared/extra-utils/videos/video-playlists.ts | 4 | ||||
-rw-r--r-- | shared/extra-utils/videos/videos.ts | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/shared/extra-utils/videos/video-playlists.ts b/shared/extra-utils/videos/video-playlists.ts index 4d110a131..fd62bef19 100644 --- a/shared/extra-utils/videos/video-playlists.ts +++ b/shared/extra-utils/videos/video-playlists.ts | |||
@@ -252,10 +252,10 @@ function reorderVideosPlaylist (options: { | |||
252 | 252 | ||
253 | async function checkPlaylistFilesWereRemoved ( | 253 | async function checkPlaylistFilesWereRemoved ( |
254 | playlistUUID: string, | 254 | playlistUUID: string, |
255 | serverNumber: number, | 255 | internalServerNumber: number, |
256 | directories = [ 'thumbnails' ] | 256 | directories = [ 'thumbnails' ] |
257 | ) { | 257 | ) { |
258 | const testDirectory = 'test' + serverNumber | 258 | const testDirectory = 'test' + internalServerNumber |
259 | 259 | ||
260 | for (const directory of directories) { | 260 | for (const directory of directories) { |
261 | const directoryPath = join(root(), testDirectory, directory) | 261 | const directoryPath = join(root(), testDirectory, directory) |
diff --git a/shared/extra-utils/videos/videos.ts b/shared/extra-utils/videos/videos.ts index b5a07b792..b64de2470 100644 --- a/shared/extra-utils/videos/videos.ts +++ b/shared/extra-utils/videos/videos.ts | |||
@@ -568,8 +568,8 @@ async function completeVideoCheck ( | |||
568 | expect(file).not.to.be.undefined | 568 | expect(file).not.to.be.undefined |
569 | 569 | ||
570 | let extension = extname(attributes.fixture) | 570 | let extension = extname(attributes.fixture) |
571 | // Transcoding enabled on server 2, extension will always be .mp4 | 571 | // Transcoding enabled: extension will always be .mp4 |
572 | if (attributes.account.host === 'localhost:9002') extension = '.mp4' | 572 | if (attributes.files.length > 1) extension = '.mp4' |
573 | 573 | ||
574 | const magnetUri = file.magnetUri | 574 | const magnetUri = file.magnetUri |
575 | expect(file.magnetUri).to.have.lengthOf.above(2) | 575 | expect(file.magnetUri).to.have.lengthOf.above(2) |