aboutsummaryrefslogtreecommitdiffhomepage
path: root/server
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2023-05-10 13:57:06 +0200
committerChocobozzz <me@florianbigard.com>2023-05-10 13:57:06 +0200
commit644391bee644c9078695ab042743d108870de7ef (patch)
tree5adb7f38a9f5c1f14a6a555982f1f8d4616168ba /server
parent7590f7a8684c69c38d30dab68377720da16d2420 (diff)
downloadPeerTube-644391bee644c9078695ab042743d108870de7ef.tar.gz
PeerTube-644391bee644c9078695ab042743d108870de7ef.tar.zst
PeerTube-644391bee644c9078695ab042743d108870de7ef.zip
Fix test cleanup
Diffstat (limited to 'server')
-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
5 files changed, 8 insertions, 8 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 }