diff options
author | Chocobozzz <me@florianbigard.com> | 2023-05-23 10:49:45 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2023-05-23 10:49:45 +0200 |
commit | f89189907bbdff6c4bc6d3460ed9ef4c49515f17 (patch) | |
tree | c55e50e3fc02ae9b3f2d1d19d95160af98cc7d7c /server/tests/api/live | |
parent | 41cde76bbf5ac16a90b5f158672523069db74009 (diff) | |
download | PeerTube-f89189907bbdff6c4bc6d3460ed9ef4c49515f17.tar.gz PeerTube-f89189907bbdff6c4bc6d3460ed9ef4c49515f17.tar.zst PeerTube-f89189907bbdff6c4bc6d3460ed9ef4c49515f17.zip |
Prevent object storage mock conflicts
When running tests in parallel
Diffstat (limited to 'server/tests/api/live')
-rw-r--r-- | server/tests/api/live/live-fast-restream.ts | 3 | ||||
-rw-r--r-- | server/tests/api/live/live.ts | 8 |
2 files changed, 2 insertions, 9 deletions
diff --git a/server/tests/api/live/live-fast-restream.ts b/server/tests/api/live/live-fast-restream.ts index 2169393c2..d7085a957 100644 --- a/server/tests/api/live/live-fast-restream.ts +++ b/server/tests/api/live/live-fast-restream.ts | |||
@@ -65,8 +65,7 @@ describe('Fast restream in live', function () { | |||
65 | server, | 65 | server, |
66 | videoUUID: liveVideoUUID, | 66 | videoUUID: liveVideoUUID, |
67 | segment: 1, | 67 | segment: 1, |
68 | playlistNumber: 0, | 68 | playlistNumber: 0 |
69 | objectStorage: false | ||
70 | }) | 69 | }) |
71 | 70 | ||
72 | return { ffmpegCommand, liveVideoUUID } | 71 | return { ffmpegCommand, liveVideoUUID } |
diff --git a/server/tests/api/live/live.ts b/server/tests/api/live/live.ts index 65ebbc5f7..7ab67b126 100644 --- a/server/tests/api/live/live.ts +++ b/server/tests/api/live/live.ts | |||
@@ -423,7 +423,6 @@ describe('Test live', function () { | |||
423 | servers, | 423 | servers, |
424 | liveVideoId, | 424 | liveVideoId, |
425 | resolutions: [ 720 ], | 425 | resolutions: [ 720 ], |
426 | objectStorage: false, | ||
427 | transcoded: true | 426 | transcoded: true |
428 | }) | 427 | }) |
429 | 428 | ||
@@ -459,7 +458,6 @@ describe('Test live', function () { | |||
459 | servers, | 458 | servers, |
460 | liveVideoId, | 459 | liveVideoId, |
461 | resolutions: resolutions.concat([ 720 ]), | 460 | resolutions: resolutions.concat([ 720 ]), |
462 | objectStorage: false, | ||
463 | transcoded: true | 461 | transcoded: true |
464 | }) | 462 | }) |
465 | 463 | ||
@@ -512,7 +510,6 @@ describe('Test live', function () { | |||
512 | servers, | 510 | servers, |
513 | liveVideoId, | 511 | liveVideoId, |
514 | resolutions, | 512 | resolutions, |
515 | objectStorage: false, | ||
516 | transcoded: true | 513 | transcoded: true |
517 | }) | 514 | }) |
518 | 515 | ||
@@ -609,7 +606,6 @@ describe('Test live', function () { | |||
609 | servers, | 606 | servers, |
610 | liveVideoId, | 607 | liveVideoId, |
611 | resolutions, | 608 | resolutions, |
612 | objectStorage: false, | ||
613 | transcoded: true | 609 | transcoded: true |
614 | }) | 610 | }) |
615 | 611 | ||
@@ -646,7 +642,6 @@ describe('Test live', function () { | |||
646 | servers, | 642 | servers, |
647 | liveVideoId, | 643 | liveVideoId, |
648 | resolutions: [ 720 ], | 644 | resolutions: [ 720 ], |
649 | objectStorage: false, | ||
650 | transcoded: true | 645 | transcoded: true |
651 | }) | 646 | }) |
652 | 647 | ||
@@ -720,8 +715,7 @@ describe('Test live', function () { | |||
720 | server: servers[0], | 715 | server: servers[0], |
721 | videoUUID, | 716 | videoUUID, |
722 | playlistNumber: 0, | 717 | playlistNumber: 0, |
723 | segment: 2, | 718 | segment: 2 |
724 | objectStorage: false | ||
725 | }) | 719 | }) |
726 | } | 720 | } |
727 | 721 | ||