diff options
author | Chocobozzz <florian.bigard@gmail.com> | 2017-11-17 15:42:12 +0100 |
---|---|---|
committer | Chocobozzz <florian.bigard@gmail.com> | 2017-11-27 19:40:52 +0100 |
commit | 572f8d3dba44ba874f5c51023214273e3f5b643c (patch) | |
tree | d8f71046205d5e4618f5a1c5ed002dd1b8bc6661 /server/tests/api/video-privacy.ts | |
parent | 9a27cdc27c900feaae5f6db4315c4ccdfc0c4493 (diff) | |
download | PeerTube-572f8d3dba44ba874f5c51023214273e3f5b643c.tar.gz PeerTube-572f8d3dba44ba874f5c51023214273e3f5b643c.tar.zst PeerTube-572f8d3dba44ba874f5c51023214273e3f5b643c.zip |
Fix public video we set to public or unlisted
Diffstat (limited to 'server/tests/api/video-privacy.ts')
-rw-r--r-- | server/tests/api/video-privacy.ts | 15 |
1 files changed, 8 insertions, 7 deletions
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 () { | |||
27 | let unlistedVideoUUID | 27 | let unlistedVideoUUID |
28 | 28 | ||
29 | before(async function () { | 29 | before(async function () { |
30 | this.timeout(120000) | 30 | this.timeout(50000) |
31 | 31 | ||
32 | // Run servers | 32 | // Run servers |
33 | servers = await flushAndRunMultipleServers(2) | 33 | servers = await flushAndRunMultipleServers(2) |
@@ -40,14 +40,14 @@ describe('Test video privacy', function () { | |||
40 | }) | 40 | }) |
41 | 41 | ||
42 | it('Should upload a private video on server 1', async function () { | 42 | it('Should upload a private video on server 1', async function () { |
43 | this.timeout(25000) | 43 | this.timeout(10000) |
44 | 44 | ||
45 | const attributes = { | 45 | const attributes = { |
46 | privacy: VideoPrivacy.PRIVATE | 46 | privacy: VideoPrivacy.PRIVATE |
47 | } | 47 | } |
48 | await uploadVideo(servers[0].url, servers[0].accessToken, attributes) | 48 | await uploadVideo(servers[0].url, servers[0].accessToken, attributes) |
49 | 49 | ||
50 | await wait(15000) | 50 | await wait(5000) |
51 | }) | 51 | }) |
52 | 52 | ||
53 | it('Should not have this private video on server 2', async function () { | 53 | it('Should not have this private video on server 2', async function () { |
@@ -87,7 +87,7 @@ describe('Test video privacy', function () { | |||
87 | }) | 87 | }) |
88 | 88 | ||
89 | it('Should upload an unlisted video on server 2', async function () { | 89 | it('Should upload an unlisted video on server 2', async function () { |
90 | this.timeout(50000) | 90 | this.timeout(30000) |
91 | 91 | ||
92 | const attributes = { | 92 | const attributes = { |
93 | name: 'unlisted video', | 93 | name: 'unlisted video', |
@@ -95,7 +95,8 @@ describe('Test video privacy', function () { | |||
95 | } | 95 | } |
96 | await uploadVideo(servers[1].url, servers[1].accessToken, attributes) | 96 | await uploadVideo(servers[1].url, servers[1].accessToken, attributes) |
97 | 97 | ||
98 | await wait(40000) | 98 | // Server 2 has transcoding enabled |
99 | await wait(10000) | ||
99 | }) | 100 | }) |
100 | 101 | ||
101 | it('Should not have this unlisted video listed on server 1 and 2', async function () { | 102 | it('Should not have this unlisted video listed on server 1 and 2', async function () { |
@@ -125,7 +126,7 @@ describe('Test video privacy', function () { | |||
125 | }) | 126 | }) |
126 | 127 | ||
127 | it('Should update the private video to public on server 1', async function () { | 128 | it('Should update the private video to public on server 1', async function () { |
128 | this.timeout(40000) | 129 | this.timeout(10000) |
129 | 130 | ||
130 | const attribute = { | 131 | const attribute = { |
131 | name: 'super video public', | 132 | name: 'super video public', |
@@ -134,7 +135,7 @@ describe('Test video privacy', function () { | |||
134 | 135 | ||
135 | await updateVideo(servers[0].url, servers[0].accessToken, privateVideoId, attribute) | 136 | await updateVideo(servers[0].url, servers[0].accessToken, privateVideoId, attribute) |
136 | 137 | ||
137 | await wait(30000) | 138 | await wait(5000) |
138 | }) | 139 | }) |
139 | 140 | ||
140 | it('Should have this new public video listed on server 1 and 2', async function () { | 141 | it('Should have this new public video listed on server 1 and 2', async function () { |