Merge branch 'develop' into shorter-URLs-channels-accounts

3 files changed, 15 insertions, 14 deletions

diff --git a/server/tests/plugins/filter-hooks.ts b/server/tests/plugins/filter-hooks.ts
index ac958c5f5..1d6bb6cf4 100644
--- a/server/tests/plugins/filter-hooks.ts
+++ b/server/tests/plugins/filter-hooks.ts
@@ -38,6 +38,7 @@ import {
 import { cleanupTests, flushAndRunMultipleServers, ServerInfo, waitUntilLog } from '../../../shared/extra-utils/server/servers'
 import { getGoodVideoUrl, getMyVideoImports, importVideo } from '../../../shared/extra-utils/videos/video-imports'
 import {
+  VideoCommentThreadTree,
   VideoDetails,
   VideoImport,
   VideoImportState,
@@ -45,7 +46,6 @@ import {
   VideoPlaylistPrivacy,
   VideoPrivacy
 } from '../../../shared/models/videos'
-import { VideoCommentThreadTree } from '../../../shared/models/videos/video-comment.model'
 
 const expect = chai.expect
 
@@ -55,7 +55,7 @@ describe('Test plugin filter hooks', function () {
   let threadId: number
 
   before(async function () {
-    this.timeout(30000)
+    this.timeout(60000)
 
     servers = await flushAndRunMultipleServers(2)
     await setAccessTokensToServers(servers)
@@ -326,7 +326,7 @@ describe('Test plugin filter hooks', function () {
     })
 
     it('Should blacklist on remote upload', async function () {
-      this.timeout(45000)
+      this.timeout(60000)
 
       const res = await uploadVideo(servers[1].url, servers[1].accessToken, { name: 'remote please blacklist me' })
       await waitJobs(servers)
@@ -335,7 +335,7 @@ describe('Test plugin filter hooks', function () {
     })
 
     it('Should blacklist on remote update', async function () {
-      this.timeout(45000)
+      this.timeout(60000)
 
       const res = await uploadVideo(servers[1].url, servers[1].accessToken, { name: 'video' })
       await waitJobs(servers)
diff --git a/server/tests/plugins/plugin-helpers.ts b/server/tests/plugins/plugin-helpers.ts
index 20020ec41..f72de8229 100644
--- a/server/tests/plugins/plugin-helpers.ts
+++ b/server/tests/plugins/plugin-helpers.ts
@@ -133,6 +133,7 @@ describe('Test plugin helpers', function () {
       })
 
       expect(res.body.username).to.equal('root')
+      expect(res.body.displayName).to.equal('root')
       expect(res.body.isAdmin).to.be.true
       expect(res.body.isModerator).to.be.false
       expect(res.body.isUser).to.be.false
diff --git a/server/tests/plugins/plugin-transcoding.ts b/server/tests/plugins/plugin-transcoding.ts
index c834b6985..eefb2294d 100644
--- a/server/tests/plugins/plugin-transcoding.ts
+++ b/server/tests/plugins/plugin-transcoding.ts
@@ -125,7 +125,7 @@ describe('Test transcoding plugins', function () {
     })
 
     it('Should not use the plugin profile if not chosen by the admin', async function () {
-      this.timeout(120000)
+      this.timeout(240000)
 
       const videoUUID = (await uploadVideoAndGetId({ server, videoName: 'video' })).uuid
       await waitJobs([ server ])
@@ -134,7 +134,7 @@ describe('Test transcoding plugins', function () {
     })
 
     it('Should use the vod profile', async function () {
-      this.timeout(120000)
+      this.timeout(240000)
 
       await updateConf(server, 'low-vod', 'default')
 
@@ -145,7 +145,7 @@ describe('Test transcoding plugins', function () {
     })
 
     it('Should apply input options in vod profile', async function () {
-      this.timeout(120000)
+      this.timeout(240000)
 
       await updateConf(server, 'input-options-vod', 'default')
 
@@ -156,7 +156,7 @@ describe('Test transcoding plugins', function () {
     })
 
     it('Should apply the scale filter in vod profile', async function () {
-      this.timeout(120000)
+      this.timeout(240000)
 
       await updateConf(server, 'bad-scale-vod', 'default')
 
@@ -172,7 +172,7 @@ describe('Test transcoding plugins', function () {
     })
 
     it('Should not use the plugin profile if not chosen by the admin', async function () {
-      this.timeout(120000)
+      this.timeout(240000)
 
       const liveVideoId = await createLiveWrapper(server)
 
@@ -184,7 +184,7 @@ describe('Test transcoding plugins', function () {
     })
 
     it('Should use the live profile', async function () {
-      this.timeout(120000)
+      this.timeout(240000)
 
       await updateConf(server, 'low-vod', 'low-live')
 
@@ -198,7 +198,7 @@ describe('Test transcoding plugins', function () {
     })
 
     it('Should apply the input options on live profile', async function () {
-      this.timeout(120000)
+      this.timeout(240000)
 
       await updateConf(server, 'low-vod', 'input-options-live')
 
@@ -212,7 +212,7 @@ describe('Test transcoding plugins', function () {
     })
 
     it('Should apply the scale filter name on live profile', async function () {
-      this.timeout(120000)
+      this.timeout(240000)
 
       await updateConf(server, 'low-vod', 'bad-scale-live')
 
@@ -223,7 +223,7 @@ describe('Test transcoding plugins', function () {
     })
 
     it('Should default to the default profile if the specified profile does not exist', async function () {
-      this.timeout(120000)
+      this.timeout(240000)
 
       await uninstallPlugin({ url: server.url, accessToken: server.accessToken, npmName: 'peertube-plugin-test-transcoding-one' })
 
@@ -268,7 +268,7 @@ describe('Test transcoding plugins', function () {
     })
 
     it('Should use the new live encoders', async function () {
-      this.timeout(120000)
+      this.timeout(240000)
 
       const liveVideoId = await createLiveWrapper(server)