From 572f8d3dba44ba874f5c51023214273e3f5b643c Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 17 Nov 2017 15:42:12 +0100 Subject: Fix public video we set to public or unlisted --- server/tests/api/multiple-servers.ts | 47 ++++++++++++-------------- server/tests/api/services.ts | 2 +- server/tests/api/single-server.ts | 2 +- server/tests/api/users.ts | 2 +- server/tests/api/video-abuse.ts | 14 ++++---- server/tests/api/video-blacklist-management.ts | 6 ++-- server/tests/api/video-blacklist.ts | 6 ++-- server/tests/api/video-channels.ts | 2 +- server/tests/api/video-description.ts | 10 +++--- server/tests/api/video-privacy.ts | 15 ++++---- server/tests/api/video-transcoder.ts | 6 ++-- server/tests/utils/follows.ts | 6 ++-- 12 files changed, 57 insertions(+), 61 deletions(-) (limited to 'server/tests') diff --git a/server/tests/api/multiple-servers.ts b/server/tests/api/multiple-servers.ts index 737770992..b6a57ab6d 100644 --- a/server/tests/api/multiple-servers.ts +++ b/server/tests/api/multiple-servers.ts @@ -85,7 +85,7 @@ describe('Test multiple servers', function () { } await uploadVideo(servers[0].url, servers[0].accessToken, videoAttributes) - await wait(11000) + await wait(5000) // All servers should have this video for (const server of servers) { @@ -153,7 +153,7 @@ describe('Test multiple servers', function () { }) it('Should upload the video on server 2 and propagate on each server', async function () { - this.timeout(120000) + this.timeout(50000) const user = { username: 'user1', @@ -174,8 +174,8 @@ describe('Test multiple servers', function () { } await uploadVideo(servers[1].url, userAccessToken, videoAttributes) - // Transcoding, so wait more than 22000 - await wait(60000) + // Transcoding + await wait(10000) // All servers should have this video for (const server of servers) { @@ -282,7 +282,7 @@ describe('Test multiple servers', function () { } await uploadVideo(servers[2].url, servers[2].accessToken, videoAttributes2) - await wait(33000) + await wait(10000) let baseMagnet = null // All servers should have this video @@ -384,8 +384,7 @@ describe('Test multiple servers', function () { describe('Should seed the uploaded video', function () { it('Should add the file 1 by asking server 3', async function () { - // Yes, this could be long - this.timeout(200000) + this.timeout(10000) const res = await getVideosList(servers[2].url) @@ -403,8 +402,7 @@ describe('Test multiple servers', function () { }) it('Should add the file 2 by asking server 1', async function () { - // Yes, this could be long - this.timeout(200000) + this.timeout(10000) const res = await getVideosList(servers[0].url) @@ -419,8 +417,7 @@ describe('Test multiple servers', function () { }) it('Should add the file 3 by asking server 2', async function () { - // Yes, this could be long - this.timeout(200000) + this.timeout(10000) const res = await getVideosList(servers[1].url) @@ -435,8 +432,7 @@ describe('Test multiple servers', function () { }) it('Should add the file 3-2 by asking server 1', async function () { - // Yes, this could be long - this.timeout(200000) + this.timeout(10000) const res = await getVideosList(servers[0].url) @@ -451,8 +447,7 @@ describe('Test multiple servers', function () { }) it('Should add the file 2 in 360p by asking server 1', async function () { - // Yes, this could be long - this.timeout(200000) + this.timeout(10000) const res = await getVideosList(servers[0].url) @@ -489,7 +484,7 @@ describe('Test multiple servers', function () { }) it('Should view multiple videos on owned servers', async function () { - this.timeout(30000) + this.timeout(10000) const tasks: Promise[] = [] tasks.push(getVideo(servers[2].url, localVideosServer3[0])) @@ -499,7 +494,7 @@ describe('Test multiple servers', function () { await Promise.all(tasks) - await wait(22000) + await wait(5000) for (const server of servers) { const res = await getVideosList(server.url) @@ -514,7 +509,7 @@ describe('Test multiple servers', function () { }) it('Should view multiple videos on each servers', async function () { - this.timeout(30000) + this.timeout(15000) const tasks: Promise[] = [] tasks.push(getVideo(servers[0].url, remoteVideosServer1[0])) @@ -530,7 +525,7 @@ describe('Test multiple servers', function () { await Promise.all(tasks) - await wait(22000) + await wait(10000) let baseVideos = null @@ -553,7 +548,7 @@ describe('Test multiple servers', function () { }) it('Should like and dislikes videos on different services', async function () { - this.timeout(30000) + this.timeout(20000) const tasks: Promise[] = [] tasks.push(rateVideo(servers[0].url, servers[0].accessToken, remoteVideosServer1[0], 'like')) @@ -566,7 +561,7 @@ describe('Test multiple servers', function () { await Promise.all(tasks) - await wait(22000) + await wait(10000) let baseVideos = null for (const server of servers) { @@ -591,7 +586,7 @@ describe('Test multiple servers', function () { describe('Should manipulate these videos', function () { it('Should update the video 3 by asking server 3', async function () { - this.timeout(15000) + this.timeout(10000) const attributes = { name: 'my super video updated', @@ -605,11 +600,11 @@ describe('Test multiple servers', function () { await updateVideo(servers[2].url, servers[2].accessToken, toRemove[0].id, attributes) - await wait(11000) + await wait(5000) }) it('Should have the video 3 updated on each server', async function () { - this.timeout(200000) + this.timeout(10000) for (const server of servers) { const res = await getVideosList(server.url) @@ -651,12 +646,12 @@ describe('Test multiple servers', function () { }) it('Should remove the videos 3 and 3-2 by asking server 3', async function () { - this.timeout(15000) + this.timeout(10000) await removeVideo(servers[2].url, servers[2].accessToken, toRemove[0].id) await removeVideo(servers[2].url, servers[2].accessToken, toRemove[1].id) - await wait(11000) + await wait(5000) }) it('Should have videos 1 and 3 on each server', async function () { diff --git a/server/tests/api/services.ts b/server/tests/api/services.ts index 3e6506de4..8d96ccc5e 100644 --- a/server/tests/api/services.ts +++ b/server/tests/api/services.ts @@ -19,7 +19,7 @@ describe('Test services', function () { let server: ServerInfo = null before(async function () { - this.timeout(120000) + this.timeout(10000) await flushTests() diff --git a/server/tests/api/single-server.ts b/server/tests/api/single-server.ts index 82ecc68ee..11080085d 100644 --- a/server/tests/api/single-server.ts +++ b/server/tests/api/single-server.ts @@ -41,7 +41,7 @@ describe('Test a single server', function () { let videosListBase: any[] = null before(async function () { - this.timeout(120000) + this.timeout(10000) await flushTests() diff --git a/server/tests/api/users.ts b/server/tests/api/users.ts index 055dade04..5c0531571 100644 --- a/server/tests/api/users.ts +++ b/server/tests/api/users.ts @@ -39,7 +39,7 @@ describe('Test users', function () { let userId: number before(async function () { - this.timeout(120000) + this.timeout(10000) await flushTests() server = await runServer(1) diff --git a/server/tests/api/video-abuse.ts b/server/tests/api/video-abuse.ts index bc21ee59b..60bee9c3d 100644 --- a/server/tests/api/video-abuse.ts +++ b/server/tests/api/video-abuse.ts @@ -22,7 +22,7 @@ describe('Test video abuses', function () { let servers: ServerInfo[] = [] before(async function () { - this.timeout(100000) + this.timeout(50000) // Run servers servers = await flushAndRunMultipleServers(2) @@ -46,8 +46,8 @@ describe('Test video abuses', function () { } await uploadVideo(servers[1].url, servers[1].accessToken, video2Attributes) - // Wait videos propagation - await wait(25000) + // Wait videos propagation, server 2 has transcoding enabled + await wait(10000) const res = await getVideosList(servers[0].url) const videos = res.body.data @@ -67,13 +67,13 @@ describe('Test video abuses', function () { }) it('Should report abuse on a local video', async function () { - this.timeout(15000) + this.timeout(10000) const reason = 'my super bad reason' await reportVideoAbuse(servers[0].url, servers[0].accessToken, servers[0].video.id, reason) // We wait requests propagation, even if the server 1 is not supposed to make a request to server 2 - await wait(11000) + await wait(5000) }) it('Should have 1 video abuses on server 1 and 0 on server 2', async function () { @@ -96,13 +96,13 @@ describe('Test video abuses', function () { }) it('Should report abuse on a remote video', async function () { - this.timeout(25000) + this.timeout(10000) const reason = 'my super bad reason 2' await reportVideoAbuse(servers[0].url, servers[0].accessToken, servers[1].video.id, reason) // We wait requests propagation - await wait(15000) + await wait(5000) }) it('Should have 2 video abuse on server 1 and 1 on server 2', async function () { diff --git a/server/tests/api/video-blacklist-management.ts b/server/tests/api/video-blacklist-management.ts index 718789318..0c636e094 100644 --- a/server/tests/api/video-blacklist-management.ts +++ b/server/tests/api/video-blacklist-management.ts @@ -35,7 +35,7 @@ describe('Test video blacklist management', function () { } before(async function () { - this.timeout(120000) + this.timeout(50000) // Run servers servers = await flushAndRunMultipleServers(2) @@ -50,8 +50,8 @@ describe('Test video blacklist management', function () { await uploadVideo(servers[1].url, servers[1].accessToken, { name: 'My 1st video', description: 'A video on server 2' }) await uploadVideo(servers[1].url, servers[1].accessToken, { name: 'My 2nd video', description: 'A video on server 2' }) - // Wait videos propagation - await wait(50000) + // Wait videos propagation, server 2 has transcoding enabled + await wait(15000) // Blacklist the two videos on server 1 await blacklistVideosOnServer(servers[0]) diff --git a/server/tests/api/video-blacklist.ts b/server/tests/api/video-blacklist.ts index 235fdd7af..3afd8c510 100644 --- a/server/tests/api/video-blacklist.ts +++ b/server/tests/api/video-blacklist.ts @@ -22,7 +22,7 @@ describe('Test video blacklists', function () { let servers: ServerInfo[] = [] before(async function () { - this.timeout(120000) + this.timeout(50000) // Run servers servers = await flushAndRunMultipleServers(2) @@ -40,8 +40,8 @@ describe('Test video blacklists', function () { } await uploadVideo(servers[1].url, servers[1].accessToken, videoAttributes) - // Wait videos propagation - await wait(25000) + // Wait videos propagation, server 2 has transcoding enabled + await wait(10000) const res = await getVideosList(servers[0].url) const videos = res.body.data diff --git a/server/tests/api/video-channels.ts b/server/tests/api/video-channels.ts index de1807ef2..2d8efb320 100644 --- a/server/tests/api/video-channels.ts +++ b/server/tests/api/video-channels.ts @@ -26,7 +26,7 @@ describe('Test a video channels', function () { let videoChannelId: number before(async function () { - this.timeout(120000) + this.timeout(10000) await flushTests() diff --git a/server/tests/api/video-description.ts b/server/tests/api/video-description.ts index 187fd21f2..7ad1c63ae 100644 --- a/server/tests/api/video-description.ts +++ b/server/tests/api/video-description.ts @@ -26,7 +26,7 @@ describe('Test video description', function () { let longDescription = 'my super description for server 1'.repeat(50) before(async function () { - this.timeout(30000) + this.timeout(40000) // Run servers servers = await flushAndRunMultipleServers(2) @@ -39,14 +39,14 @@ describe('Test video description', function () { }) it('Should upload video with long description', async function () { - this.timeout(30000) + this.timeout(10000) const attributes = { description: longDescription } await uploadVideo(servers[0].url, servers[0].accessToken, attributes) - await wait(25000) + await wait(5000) const res = await getVideosList(servers[0].url) @@ -78,14 +78,14 @@ describe('Test video description', function () { }) it('Should update with a short description', async function () { - this.timeout(30000) + this.timeout(10000) const attributes = { description: 'short description' } await updateVideo(servers[0].url, servers[0].accessToken, videoId, attributes) - await wait(25000) + await wait(5000) }) it('Should have a small description on each server', async function () { diff --git a/server/tests/api/video-privacy.ts b/server/tests/api/video-privacy.ts index bf91ead2e..26847efce 100644 --- a/server/tests/api/video-privacy.ts +++ b/server/tests/api/video-privacy.ts @@ -27,7 +27,7 @@ describe('Test video privacy', function () { let unlistedVideoUUID before(async function () { - this.timeout(120000) + this.timeout(50000) // Run servers servers = await flushAndRunMultipleServers(2) @@ -40,14 +40,14 @@ describe('Test video privacy', function () { }) it('Should upload a private video on server 1', async function () { - this.timeout(25000) + this.timeout(10000) const attributes = { privacy: VideoPrivacy.PRIVATE } await uploadVideo(servers[0].url, servers[0].accessToken, attributes) - await wait(15000) + await wait(5000) }) it('Should not have this private video on server 2', async function () { @@ -87,7 +87,7 @@ describe('Test video privacy', function () { }) it('Should upload an unlisted video on server 2', async function () { - this.timeout(50000) + this.timeout(30000) const attributes = { name: 'unlisted video', @@ -95,7 +95,8 @@ describe('Test video privacy', function () { } await uploadVideo(servers[1].url, servers[1].accessToken, attributes) - await wait(40000) + // Server 2 has transcoding enabled + await wait(10000) }) it('Should not have this unlisted video listed on server 1 and 2', async function () { @@ -125,7 +126,7 @@ describe('Test video privacy', function () { }) it('Should update the private video to public on server 1', async function () { - this.timeout(40000) + this.timeout(10000) const attribute = { name: 'super video public', @@ -134,7 +135,7 @@ describe('Test video privacy', function () { await updateVideo(servers[0].url, servers[0].accessToken, privateVideoId, attribute) - await wait(30000) + await wait(5000) }) it('Should have this new public video listed on server 1 and 2', async function () { diff --git a/server/tests/api/video-transcoder.ts b/server/tests/api/video-transcoder.ts index e80b099d1..95d48342f 100644 --- a/server/tests/api/video-transcoder.ts +++ b/server/tests/api/video-transcoder.ts @@ -21,7 +21,7 @@ describe('Test video transcoding', function () { let servers: ServerInfo[] = [] before(async function () { - this.timeout(60000) + this.timeout(10000) // Run servers servers = await flushAndRunMultipleServers(2) @@ -39,7 +39,7 @@ describe('Test video transcoding', function () { } await uploadVideo(servers[0].url, servers[0].accessToken, videoAttributes) - await wait(30000) + await wait(10000) const res = await getVideosList(servers[0].url) const video = res.body.data[0] @@ -67,7 +67,7 @@ describe('Test video transcoding', function () { } await uploadVideo(servers[1].url, servers[1].accessToken, videoAttributes) - await wait(30000) + await wait(10000) const res = await getVideosList(servers[1].url) diff --git a/server/tests/utils/follows.ts b/server/tests/utils/follows.ts index cffc1648f..618436b3c 100644 --- a/server/tests/utils/follows.ts +++ b/server/tests/utils/follows.ts @@ -39,9 +39,6 @@ async function follow (follower: string, following: string[], accessToken: strin .send({ 'hosts': followingHosts }) .expect(expectedStatus) - // Wait request propagation - await wait(20000) - return res } @@ -51,6 +48,9 @@ async function doubleFollow (server1: ServerInfo, server2: ServerInfo) { follow(server2.url, [ server1.url ], server2.accessToken) ]) + // Wait request propagation + await wait(20000) + return true } -- cgit v1.2.3