aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--server/tests/api/check-params/videos.ts2
-rw-r--r--server/tests/api/object-storage/live.ts4
-rw-r--r--server/tests/api/object-storage/video-imports.ts4
-rw-r--r--server/tests/api/object-storage/videos.ts2
-rw-r--r--server/tests/api/videos/video-channel-syncs.ts4
-rw-r--r--shared/server-commands/server/servers-command.ts1
-rw-r--r--shared/server-commands/videos/streaming-playlists-command.ts6
7 files changed, 12 insertions, 11 deletions
diff --git a/server/tests/api/check-params/videos.ts b/server/tests/api/check-params/videos.ts
index 572ca8997..094ab6891 100644
--- a/server/tests/api/check-params/videos.ts
+++ b/server/tests/api/check-params/videos.ts
@@ -437,7 +437,7 @@ describe('Test videos API validator', function () {
437 }) 437 })
438 438
439 it('Should succeed with the correct parameters', async function () { 439 it('Should succeed with the correct parameters', async function () {
440 this.timeout(10000) 440 this.timeout(30000)
441 441
442 const fields = baseCorrectParams 442 const fields = baseCorrectParams
443 443
diff --git a/server/tests/api/object-storage/live.ts b/server/tests/api/object-storage/live.ts
index c430cd0a0..7f8db40e5 100644
--- a/server/tests/api/object-storage/live.ts
+++ b/server/tests/api/object-storage/live.ts
@@ -5,10 +5,10 @@ import { expectStartWith, MockObjectStorageProxy, SQLCommand, testLiveVideoResol
5import { areMockObjectStorageTestsDisabled } from '@shared/core-utils' 5import { areMockObjectStorageTestsDisabled } from '@shared/core-utils'
6import { HttpStatusCode, LiveVideoCreate, VideoPrivacy } from '@shared/models' 6import { HttpStatusCode, LiveVideoCreate, VideoPrivacy } from '@shared/models'
7import { 7import {
8 cleanupTests,
8 createMultipleServers, 9 createMultipleServers,
9 doubleFollow, 10 doubleFollow,
10 findExternalSavedVideo, 11 findExternalSavedVideo,
11 killallServers,
12 makeRawRequest, 12 makeRawRequest,
13 ObjectStorageCommand, 13 ObjectStorageCommand,
14 PeerTubeServer, 14 PeerTubeServer,
@@ -290,6 +290,6 @@ describe('Object storage for lives', function () {
290 after(async function () { 290 after(async function () {
291 await sqlCommandServer1.cleanup() 291 await sqlCommandServer1.cleanup()
292 292
293 await killallServers(servers) 293 await cleanupTests(servers)
294 }) 294 })
295}) 295})
diff --git a/server/tests/api/object-storage/video-imports.ts b/server/tests/api/object-storage/video-imports.ts
index 11c866411..d5fd91b6a 100644
--- a/server/tests/api/object-storage/video-imports.ts
+++ b/server/tests/api/object-storage/video-imports.ts
@@ -5,8 +5,8 @@ import { expectStartWith, FIXTURE_URLS } from '@server/tests/shared'
5import { areMockObjectStorageTestsDisabled } from '@shared/core-utils' 5import { areMockObjectStorageTestsDisabled } from '@shared/core-utils'
6import { HttpStatusCode, VideoPrivacy } from '@shared/models' 6import { HttpStatusCode, VideoPrivacy } from '@shared/models'
7import { 7import {
8 cleanupTests,
8 createSingleServer, 9 createSingleServer,
9 killallServers,
10 makeRawRequest, 10 makeRawRequest,
11 ObjectStorageCommand, 11 ObjectStorageCommand,
12 PeerTubeServer, 12 PeerTubeServer,
@@ -103,6 +103,6 @@ describe('Object storage for video import', function () {
103 }) 103 })
104 104
105 after(async function () { 105 after(async function () {
106 await killallServers([ server ]) 106 await cleanupTests([ server ])
107 }) 107 })
108}) 108})
diff --git a/server/tests/api/object-storage/videos.ts b/server/tests/api/object-storage/videos.ts
index e90753d09..fe0720294 100644
--- a/server/tests/api/object-storage/videos.ts
+++ b/server/tests/api/object-storage/videos.ts
@@ -389,7 +389,7 @@ describe('Object storage for videos', function () {
389 }) 389 })
390 390
391 after(async function () { 391 after(async function () {
392 await killallServers([ server ]) 392 await cleanupTests([ server ])
393 }) 393 })
394 }) 394 })
395 395
diff --git a/server/tests/api/videos/video-channel-syncs.ts b/server/tests/api/videos/video-channel-syncs.ts
index a31e48d1d..12c2c158e 100644
--- a/server/tests/api/videos/video-channel-syncs.ts
+++ b/server/tests/api/videos/video-channel-syncs.ts
@@ -5,9 +5,9 @@ import { FIXTURE_URLS, SQLCommand } from '@server/tests/shared'
5import { areHttpImportTestsDisabled } from '@shared/core-utils' 5import { areHttpImportTestsDisabled } from '@shared/core-utils'
6import { VideoChannelSyncState, VideoInclude, VideoPrivacy } from '@shared/models' 6import { VideoChannelSyncState, VideoInclude, VideoPrivacy } from '@shared/models'
7import { 7import {
8 cleanupTests,
8 createMultipleServers, 9 createMultipleServers,
9 getServerImportConfig, 10 getServerImportConfig,
10 killallServers,
11 PeerTubeServer, 11 PeerTubeServer,
12 setAccessTokensToServers, 12 setAccessTokensToServers,
13 setDefaultAccountAvatar, 13 setDefaultAccountAvatar,
@@ -309,7 +309,7 @@ describe('Test channel synchronizations', function () {
309 await sqlCommand.cleanup() 309 await sqlCommand.cleanup()
310 } 310 }
311 311
312 await killallServers(servers) 312 await cleanupTests(servers)
313 }) 313 })
314 }) 314 })
315 } 315 }
diff --git a/shared/server-commands/server/servers-command.ts b/shared/server-commands/server/servers-command.ts
index 19645cb93..f174a2aa0 100644
--- a/shared/server-commands/server/servers-command.ts
+++ b/shared/server-commands/server/servers-command.ts
@@ -44,6 +44,7 @@ export class ServersCommand extends AbstractCommand {
44 44
45 await copy(origin, join('artifacts', destname)) 45 await copy(origin, join('artifacts', destname))
46 } 46 }
47 console.log(this.server.parallel)
47 48
48 if (this.server.parallel) { 49 if (this.server.parallel) {
49 const promise = saveGithubLogsIfNeeded() 50 const promise = saveGithubLogsIfNeeded()
diff --git a/shared/server-commands/videos/streaming-playlists-command.ts b/shared/server-commands/videos/streaming-playlists-command.ts
index 950808b60..e7448aa69 100644
--- a/shared/server-commands/videos/streaming-playlists-command.ts
+++ b/shared/server-commands/videos/streaming-playlists-command.ts
@@ -14,7 +14,7 @@ export class StreamingPlaylistsCommand extends AbstractCommand {
14 withRetry?: boolean // default false 14 withRetry?: boolean // default false
15 currentRetry?: number 15 currentRetry?: number
16 }): Promise<string> { 16 }): Promise<string> {
17 const { videoFileToken, reinjectVideoFileToken, withRetry, currentRetry = 1 } = options 17 const { videoFileToken, reinjectVideoFileToken, withRetry = false, currentRetry = 1 } = options
18 18
19 try { 19 try {
20 const result = await unwrapTextOrDecode(this.getRawRequest({ 20 const result = await unwrapTextOrDecode(this.getRawRequest({
@@ -51,7 +51,7 @@ export class StreamingPlaylistsCommand extends AbstractCommand {
51 withRetry?: boolean // default false 51 withRetry?: boolean // default false
52 currentRetry?: number 52 currentRetry?: number
53 }) { 53 }) {
54 const { withRetry, currentRetry = 1 } = options 54 const { withRetry = false, currentRetry = 1 } = options
55 55
56 try { 56 try {
57 const result = await unwrapBody<Buffer>(this.getRawRequest({ 57 const result = await unwrapBody<Buffer>(this.getRawRequest({
@@ -85,7 +85,7 @@ export class StreamingPlaylistsCommand extends AbstractCommand {
85 withRetry?: boolean // default false 85 withRetry?: boolean // default false
86 currentRetry?: number 86 currentRetry?: number
87 }) { 87 }) {
88 const { withRetry, currentRetry = 1 } = options 88 const { withRetry = false, currentRetry = 1 } = options
89 89
90 try { 90 try {
91 const result = await unwrapBodyOrDecodeToJSON<{ [ id: string ]: string }>(this.getRawRequest({ 91 const result = await unwrapBodyOrDecodeToJSON<{ [ id: string ]: string }>(this.getRawRequest({