From 823c34c07fc0df81110098ee1032e9d3ed70b662 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 11 May 2023 15:02:53 +0200 Subject: Fix reset sequelize instance --- server/tests/api/live/live-fast-restream.ts | 7 +++---- server/tests/api/videos/single-server.ts | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'server/tests/api') diff --git a/server/tests/api/live/live-fast-restream.ts b/server/tests/api/live/live-fast-restream.ts index 4e30feaef..2169393c2 100644 --- a/server/tests/api/live/live-fast-restream.ts +++ b/server/tests/api/live/live-fast-restream.ts @@ -2,11 +2,10 @@ import { expect } from 'chai' import { wait } from '@shared/core-utils' -import { HttpStatusCode, LiveVideoCreate, VideoPrivacy } from '@shared/models' +import { LiveVideoCreate, VideoPrivacy } from '@shared/models' import { cleanupTests, createSingleServer, - makeRawRequest, PeerTubeServer, setAccessTokensToServers, setDefaultVideoChannel, @@ -81,8 +80,8 @@ describe('Fast restream in live', function () { try { await server.live.getSegmentFile({ videoUUID: liveId, segment: 0, playlistNumber: 0 }) - await makeRawRequest({ url: video.streamingPlaylists[0].playlistUrl, expectedStatus: HttpStatusCode.OK_200 }) - await makeRawRequest({ url: video.streamingPlaylists[0].segmentsSha256Url, expectedStatus: HttpStatusCode.OK_200 }) + await server.streamingPlaylists.get({ url: video.streamingPlaylists[0].playlistUrl }) + await server.streamingPlaylists.getSegmentSha256({ url: video.streamingPlaylists[0].segmentsSha256Url }) } catch (err) { // FIXME: try to debug error in CI "Unexpected end of JSON input" console.error(err) diff --git a/server/tests/api/videos/single-server.ts b/server/tests/api/videos/single-server.ts index 72f833ec2..9fd52933f 100644 --- a/server/tests/api/videos/single-server.ts +++ b/server/tests/api/videos/single-server.ts @@ -213,7 +213,7 @@ describe('Test a single server', function () { }) it('Should upload 6 videos', async function () { - this.timeout(25000) + this.timeout(50000) const videos = new Set([ 'video_short.mp4', 'video_short.ogv', 'video_short.webm', -- cgit v1.2.3