13 files changed, 105 insertions, 98 deletions

diff --git a/server/tests/api/check-params/user-subscriptions.ts b/server/tests/api/check-params/user-subscriptions.ts
index 9f7d15b27..628a74476 100644
--- a/server/tests/api/check-params/user-subscriptions.ts
+++ b/server/tests/api/check-params/user-subscriptions.ts
@@ -5,7 +5,6 @@ import 'mocha'
 import {
   createUser,
   flushTests,
-  getMyUserInformation,
   killallServers,
   makeDeleteRequest,
   makeGetRequest,
@@ -21,7 +20,6 @@ describe('Test user subscriptions API validators', function () {
   const path = '/api/v1/users/me/subscriptions'
   let server: ServerInfo
   let userAccessToken = ''
-  let userChannelUUID: string
 
   // ---------------------------------------------------------------
 
@@ -40,11 +38,6 @@ describe('Test user subscriptions API validators', function () {
     }
     await createUser(server.url, server.accessToken, user.username, user.password)
     userAccessToken = await userLogin(server, user)
-
-    {
-      const res = await getMyUserInformation(server.url, server.accessToken)
-      userChannelUUID = res.body.videoChannels[ 0 ].uuid
-    }
   })
 
   describe('When listing my subscriptions', function () {
@@ -69,7 +62,7 @@ describe('Test user subscriptions API validators', function () {
     })
 
     it('Should success with the correct parameters', async function () {
-      await await makeGetRequest({
+      await makeGetRequest({
         url: server.url,
         path,
         token: userAccessToken,
@@ -102,7 +95,7 @@ describe('Test user subscriptions API validators', function () {
     })
 
     it('Should success with the correct parameters', async function () {
-      await await makeGetRequest({
+      await makeGetRequest({
         url: server.url,
         path,
         token: userAccessToken,
@@ -116,7 +109,7 @@ describe('Test user subscriptions API validators', function () {
       await makePostBodyRequest({
         url: server.url,
         path,
-        fields: { uri: userChannelUUID + '@localhost:9001' },
+        fields: { uri: 'user1_channel@localhost:9001' },
         statusCodeExpected: 401
       })
     })
@@ -152,7 +145,7 @@ describe('Test user subscriptions API validators', function () {
         url: server.url,
         path,
         token: server.accessToken,
-        fields: { uri: userChannelUUID + '@localhost:9001' },
+        fields: { uri: 'user1_channel@localhost:9001' },
         statusCodeExpected: 204
       })
     })
@@ -162,7 +155,7 @@ describe('Test user subscriptions API validators', function () {
     it('Should fail with a non authenticated user', async function () {
       await makeDeleteRequest({
         url: server.url,
-        path: path + '/' + userChannelUUID + '@localhost:9001',
+        path: path + '/user1_channel@localhost:9001',
         statusCodeExpected: 401
       })
     })
@@ -202,7 +195,7 @@ describe('Test user subscriptions API validators', function () {
     it('Should success with the correct parameters', async function () {
       await makeDeleteRequest({
         url: server.url,
-        path: path + '/' + userChannelUUID + '@localhost:9001',
+        path: path + '/user1_channel@localhost:9001',
         token: server.accessToken,
         statusCodeExpected: 204
       })
diff --git a/server/tests/api/check-params/video-channels.ts b/server/tests/api/check-params/video-channels.ts
index 0980de73b..bcf4b7473 100644
--- a/server/tests/api/check-params/video-channels.ts
+++ b/server/tests/api/check-params/video-channels.ts
@@ -31,7 +31,6 @@ describe('Test video channels API validator', function () {
   const videoChannelPath = '/api/v1/video-channels'
   let server: ServerInfo
   let accessTokenUser: string
-  let videoChannelUUID: string
 
   // ---------------------------------------------------------------
 
@@ -53,12 +52,6 @@ describe('Test video channels API validator', function () {
       await createUser(server.url, server.accessToken, user.username, user.password)
       accessTokenUser = await userLogin(server, user)
     }
-
-    {
-      const res = await getMyUserInformation(server.url, server.accessToken)
-      const user: User = res.body
-      videoChannelUUID = user.videoChannels[0].uuid
-    }
   })
 
   describe('When listing a video channels', function () {
@@ -83,6 +76,7 @@ describe('Test video channels API validator', function () {
 
   describe('When adding a video channel', function () {
     const baseCorrectParams = {
+      name: 'super_channel',
       displayName: 'hello',
       description: 'super description',
       support: 'super support text'
@@ -104,6 +98,16 @@ describe('Test video channels API validator', function () {
     })
 
     it('Should fail without a name', async function () {
+      const fields = omit(baseCorrectParams, 'name')
+      await makePostBodyRequest({ url: server.url, path: videoChannelPath, token: server.accessToken, fields })
+    })
+
+    it('Should fail with a bad name', async function () {
+      const fields = immutableAssign(baseCorrectParams, { name: 'super name' })
+      await makePostBodyRequest({ url: server.url, path: videoChannelPath, token: server.accessToken, fields })
+    })
+
+    it('Should fail without a name', async function () {
       const fields = omit(baseCorrectParams, 'displayName')
       await makePostBodyRequest({ url: server.url, path: videoChannelPath, token: server.accessToken, fields })
     })
@@ -142,7 +146,7 @@ describe('Test video channels API validator', function () {
     let path: string
 
     before(async function () {
-      path = videoChannelPath + '/' + videoChannelUUID
+      path = videoChannelPath + '/super_channel'
     })
 
     it('Should fail with a non authenticated user', async function () {
@@ -195,7 +199,7 @@ describe('Test video channels API validator', function () {
     let path: string
 
     before(async function () {
-      path = videoChannelPath + '/' + videoChannelUUID
+      path = videoChannelPath + '/super_channel'
     })
 
     it('Should fail with an incorrect input file', async function () {
@@ -255,18 +259,10 @@ describe('Test video channels API validator', function () {
       expect(res.body.data).to.be.an('array')
     })
 
-    it('Should fail without a correct uuid', async function () {
-      await makeGetRequest({
-        url: server.url,
-        path: videoChannelPath + '/coucou',
-        statusCodeExpected: 400
-      })
-    })
-
     it('Should return 404 with an incorrect video channel', async function () {
       await makeGetRequest({
         url: server.url,
-        path: videoChannelPath + '/4da6fde3-88f7-4d16-b119-108df5630b06',
+        path: videoChannelPath + '/super_channel2',
         statusCodeExpected: 404
       })
     })
@@ -274,7 +270,7 @@ describe('Test video channels API validator', function () {
     it('Should succeed with the correct parameters', async function () {
       await makeGetRequest({
         url: server.url,
-        path: videoChannelPath + '/' + videoChannelUUID,
+        path: videoChannelPath + '/super_channel',
         statusCodeExpected: 200
       })
     })
@@ -282,26 +278,23 @@ describe('Test video channels API validator', function () {
 
   describe('When deleting a video channel', function () {
     it('Should fail with a non authenticated user', async function () {
-      await deleteVideoChannel(server.url, 'coucou', videoChannelUUID, 401)
+      await deleteVideoChannel(server.url, 'coucou', 'super_channel', 401)
     })
 
     it('Should fail with another authenticated user', async function () {
-      await deleteVideoChannel(server.url, accessTokenUser, videoChannelUUID, 403)
+      await deleteVideoChannel(server.url, accessTokenUser, 'super_channel', 403)
     })
 
     it('Should fail with an unknown video channel id', async function () {
-      await deleteVideoChannel(server.url, server.accessToken,454554, 404)
+      await deleteVideoChannel(server.url, server.accessToken,'super_channel2', 404)
     })
 
     it('Should succeed with the correct parameters', async function () {
-      await deleteVideoChannel(server.url, server.accessToken, videoChannelUUID)
+      await deleteVideoChannel(server.url, server.accessToken, 'super_channel')
     })
 
     it('Should fail to delete the last user video channel', async function () {
-      const res = await getVideoChannelsList(server.url, 0, 1)
-      const lastVideoChannelUUID = res.body.data[0].uuid
-
-      await deleteVideoChannel(server.url, server.accessToken, lastVideoChannelUUID, 409)
+      await deleteVideoChannel(server.url, server.accessToken, 'root_channel', 409)
     })
   })
 
diff --git a/server/tests/api/server/follows.ts b/server/tests/api/server/follows.ts
index 1cad8998c..243fcd4e7 100644
--- a/server/tests/api/server/follows.ts
+++ b/server/tests/api/server/follows.ts
@@ -311,7 +311,7 @@ describe('Test follows', function () {
         likes: 1,
         dislikes: 1,
         channel: {
-          name: 'Default root channel',
+          name: 'Main root channel',
           description: '',
           isLocal
         },
diff --git a/server/tests/api/server/handle-down.ts b/server/tests/api/server/handle-down.ts
index 18a0d9ce3..df35b36eb 100644
--- a/server/tests/api/server/handle-down.ts
+++ b/server/tests/api/server/handle-down.ts
@@ -71,7 +71,7 @@ describe('Test handle downs', function () {
     privacy: VideoPrivacy.PUBLIC,
     commentsEnabled: true,
     channel: {
-      name: 'Default root channel',
+      name: 'Main root channel',
       description: '',
       isLocal: false
     },
diff --git a/server/tests/api/users/user-subscriptions.ts b/server/tests/api/users/user-subscriptions.ts
index 2ba6cdfaf..ba59a9a60 100644
--- a/server/tests/api/users/user-subscriptions.ts
+++ b/server/tests/api/users/user-subscriptions.ts
@@ -3,7 +3,7 @@
 import * as chai from 'chai'
 import 'mocha'
 import { createUser, doubleFollow, flushAndRunMultipleServers, follow, getVideosList, unfollow, userLogin } from '../../utils'
-import { getMyUserInformation, killallServers, ServerInfo, uploadVideo } from '../../utils/index'
+import { killallServers, ServerInfo, uploadVideo } from '../../utils/index'
 import { setAccessTokensToServers } from '../../utils/users/login'
 import { Video, VideoChannel } from '../../../../shared/models/videos'
 import { waitJobs } from '../../utils/server/jobs'
@@ -18,8 +18,7 @@ const expect = chai.expect
 
 describe('Test users subscriptions', function () {
   let servers: ServerInfo[] = []
-  const users: { accessToken: string, videoChannelName: string }[] = []
-  let rootChannelNameServer1: string
+  const users: { accessToken: string }[] = []
 
   before(async function () {
     this.timeout(120000)
@@ -32,19 +31,13 @@ describe('Test users subscriptions', function () {
     // Server 1 and server 2 follow each other
     await doubleFollow(servers[0], servers[1])
 
-    const res = await getMyUserInformation(servers[0].url, servers[0].accessToken)
-    rootChannelNameServer1 = res.body.videoChannels[0].name
-
     {
       for (const server of servers) {
         const user = { username: 'user' + server.serverNumber, password: 'password' }
         await createUser(server.url, server.accessToken, user.username, user.password)
 
         const accessToken = await userLogin(server, user)
-        const res = await getMyUserInformation(server.url, accessToken)
-        const videoChannels: VideoChannel[] = res.body.videoChannels
-
-        users.push({ accessToken, videoChannelName: videoChannels[0].name })
+        users.push({ accessToken })
 
         const videoName1 = 'video 1-' + server.serverNumber
         await uploadVideo(server.url, accessToken, { name: videoName1 })
@@ -64,10 +57,10 @@ describe('Test users subscriptions', function () {
   })
 
   it('User of server 1 should follow user of server 3 and root of server 1', async function () {
-    this.timeout(30000)
+    this.timeout(60000)
 
-    await addUserSubscription(servers[0].url, users[0].accessToken, users[2].videoChannelName + '@localhost:9003')
-    await addUserSubscription(servers[0].url, users[0].accessToken, rootChannelNameServer1 + '@localhost:9001')
+    await addUserSubscription(servers[0].url, users[0].accessToken, 'user3_channel@localhost:9003')
+    await addUserSubscription(servers[0].url, users[0].accessToken, 'root_channel@localhost:9001')
 
     await waitJobs(servers)
 
@@ -103,8 +96,8 @@ describe('Test users subscriptions', function () {
       expect(subscriptions).to.be.an('array')
       expect(subscriptions).to.have.lengthOf(2)
 
-      expect(subscriptions[0].name).to.equal(users[2].videoChannelName)
-      expect(subscriptions[1].name).to.equal(rootChannelNameServer1)
+      expect(subscriptions[0].name).to.equal('user3_channel')
+      expect(subscriptions[1].name).to.equal('root_channel')
     }
   })
 
@@ -131,7 +124,7 @@ describe('Test users subscriptions', function () {
   })
 
   it('Should upload a video by root on server 1 and see it in the subscription videos', async function () {
-    this.timeout(30000)
+    this.timeout(60000)
 
     const videoName = 'video server 1 added after follow'
     await uploadVideo(servers[0].url, servers[0].accessToken, { name: videoName })
@@ -172,7 +165,7 @@ describe('Test users subscriptions', function () {
   })
 
   it('Should have server 1 follow server 3 and display server 3 videos', async function () {
-    this.timeout(30000)
+    this.timeout(60000)
 
     await follow(servers[0].url, [ servers[2].url ], servers[0].accessToken)
 
@@ -190,7 +183,7 @@ describe('Test users subscriptions', function () {
   })
 
   it('Should remove follow server 1 -> server 3 and hide server 3 videos', async function () {
-    this.timeout(30000)
+    this.timeout(60000)
 
     await unfollow(servers[0].url, servers[0].accessToken, servers[2])
 
@@ -230,7 +223,7 @@ describe('Test users subscriptions', function () {
   })
 
   it('Should remove user of server 3 subscription', async function () {
-    await removeUserSubscription(servers[0].url, users[0].accessToken, users[2].videoChannelName + '@localhost:9003')
+    await removeUserSubscription(servers[0].url, users[0].accessToken, 'user3_channel@localhost:9003')
 
     await waitJobs(servers)
   })
@@ -249,7 +242,7 @@ describe('Test users subscriptions', function () {
   })
 
   it('Should remove the root subscription and not display the videos anymore', async function () {
-    await removeUserSubscription(servers[0].url, users[0].accessToken, rootChannelNameServer1 + '@localhost:9001')
+    await removeUserSubscription(servers[0].url, users[0].accessToken, 'root_channel@localhost:9001')
 
     await waitJobs(servers)
 
@@ -275,9 +268,9 @@ describe('Test users subscriptions', function () {
   })
 
   it('Should follow user of server 3 again', async function () {
-    this.timeout(30000)
+    this.timeout(60000)
 
-    await addUserSubscription(servers[0].url, users[0].accessToken, users[2].videoChannelName + '@localhost:9003')
+    await addUserSubscription(servers[0].url, users[0].accessToken, 'user3_channel@localhost:9003')
 
     await waitJobs(servers)
 
diff --git a/server/tests/api/users/users-multiple-servers.ts b/server/tests/api/users/users-multiple-servers.ts
index 81489021b..575e04546 100644
--- a/server/tests/api/users/users-multiple-servers.ts
+++ b/server/tests/api/users/users-multiple-servers.ts
@@ -12,10 +12,9 @@ import {
   getVideoChannelsList,
   removeUser,
   updateMyUser,
-  userLogin,
-  wait
+  userLogin
 } from '../../utils'
-import { flushTests, getMyUserInformation, killallServers, ServerInfo, testImage, updateMyAvatar, uploadVideo } from '../../utils/index'
+import { getMyUserInformation, killallServers, ServerInfo, testImage, updateMyAvatar, uploadVideo } from '../../utils/index'
 import { checkActorFilesWereRemoved, getAccount, getAccountsList } from '../../utils/users/accounts'
 import { setAccessTokensToServers } from '../../utils/users/login'
 import { User } from '../../../../shared/models/users'
@@ -172,7 +171,7 @@ describe('Test users with multiple servers', function () {
 
       const resVideoChannels = await getVideoChannelsList(server.url, 0, 10)
       const videoChannelDeleted = resVideoChannels.body.data.find(a => {
-        return a.displayName === 'Default user1 channel' && a.host === 'localhost:9001'
+        return a.displayName === 'Main user1 channel' && a.host === 'localhost:9001'
       }) as VideoChannel
       expect(videoChannelDeleted).not.to.be.undefined
     }
@@ -189,7 +188,7 @@ describe('Test users with multiple servers', function () {
 
       const resVideoChannels = await getVideoChannelsList(server.url, 0, 10)
       const videoChannelDeleted = resVideoChannels.body.data.find(a => {
-        return a.name === 'Default user1 channel' && a.host === 'localhost:9001'
+        return a.name === 'Main user1 channel' && a.host === 'localhost:9001'
       }) as VideoChannel
       expect(videoChannelDeleted).to.be.undefined
     }
diff --git a/server/tests/api/videos/multiple-servers.ts b/server/tests/api/videos/multiple-servers.ts
index cab096a12..3c3839338 100644
--- a/server/tests/api/videos/multiple-servers.ts
+++ b/server/tests/api/videos/multiple-servers.ts
@@ -6,7 +6,6 @@ import { join } from 'path'
 import * as request from 'supertest'
 import { VideoPrivacy } from '../../../../shared/models/videos'
 import { VideoComment, VideoCommentThreadTree } from '../../../../shared/models/videos/video-comment.model'
-
 import {
   addVideoChannel,
   checkVideoFilesWereRemoved,
@@ -60,6 +59,7 @@ describe('Test multiple servers', function () {
 
     {
       const videoChannel = {
+        name: 'super_channel_name',
         displayName: 'my channel',
         description: 'super channel'
       }
@@ -201,7 +201,7 @@ describe('Test multiple servers', function () {
           tags: [ 'tag1p2', 'tag2p2', 'tag3p2' ],
           privacy: VideoPrivacy.PUBLIC,
           channel: {
-            name: 'Default user1 channel',
+            name: 'Main user1 channel',
             description: 'super channel',
             isLocal
           },
@@ -307,7 +307,7 @@ describe('Test multiple servers', function () {
           tags: [ 'tag1p3' ],
           privacy: VideoPrivacy.PUBLIC,
           channel: {
-            name: 'Default root channel',
+            name: 'Main root channel',
             description: '',
             isLocal
           },
@@ -339,7 +339,7 @@ describe('Test multiple servers', function () {
           tags: [ 'tag2p3', 'tag3p3', 'tag4p3' ],
           privacy: VideoPrivacy.PUBLIC,
           channel: {
-            name: 'Default root channel',
+            name: 'Main root channel',
             description: '',
             isLocal
           },
@@ -647,7 +647,7 @@ describe('Test multiple servers', function () {
           tags: [ 'tag_up_1', 'tag_up_2' ],
           privacy: VideoPrivacy.PUBLIC,
           channel: {
-            name: 'Default root channel',
+            name: 'Main root channel',
             description: '',
             isLocal
           },
@@ -967,7 +967,7 @@ describe('Test multiple servers', function () {
           tags: [ ],
           privacy: VideoPrivacy.PUBLIC,
           channel: {
-            name: 'Default root channel',
+            name: 'Main root channel',
             description: '',
             isLocal
           },
diff --git a/server/tests/api/videos/single-server.ts b/server/tests/api/videos/single-server.ts
index ba4920d1b..12181ad67 100644
--- a/server/tests/api/videos/single-server.ts
+++ b/server/tests/api/videos/single-server.ts
@@ -56,7 +56,7 @@ describe('Test a single server', function () {
     privacy: VideoPrivacy.PUBLIC,
     commentsEnabled: true,
     channel: {
-      name: 'Default root channel',
+      name: 'Main root channel',
       description: '',
       isLocal: true
     },
@@ -87,7 +87,7 @@ describe('Test a single server', function () {
     duration: 5,
     commentsEnabled: false,
     channel: {
-      name: 'Default root channel',
+      name: 'Main root channel',
       description: '',
       isLocal: true
     },
diff --git a/server/tests/api/videos/video-channels.ts b/server/tests/api/videos/video-channels.ts
index e4e3ce9d9..8138c65d6 100644
--- a/server/tests/api/videos/video-channels.ts
+++ b/server/tests/api/videos/video-channels.ts
@@ -4,12 +4,13 @@ import * as chai from 'chai'
 import 'mocha'
 import { User, Video } from '../../../../shared/index'
 import {
+  createUser,
   doubleFollow,
   flushAndRunMultipleServers,
-  getVideoChannelVideos, testImage,
+  getVideoChannelVideos, serverLogin, testImage,
   updateVideo,
   updateVideoChannelAvatar,
-  uploadVideo, wait
+  uploadVideo, wait, userLogin
 } from '../../utils'
 import {
   addVideoChannel,
@@ -33,9 +34,7 @@ describe('Test video channels', function () {
   let userInfo: User
   let accountUUID: string
   let firstVideoChannelId: number
-  let firstVideoChannelUUID: string
   let secondVideoChannelId: number
-  let secondVideoChannelUUID: string
   let videoUUID: string
 
   before(async function () {
@@ -54,7 +53,6 @@ describe('Test video channels', function () {
       accountUUID = user.account.uuid
 
       firstVideoChannelId = user.videoChannels[0].id
-      firstVideoChannelUUID = user.videoChannels[0].uuid
     }
 
     await waitJobs(servers)
@@ -73,13 +71,13 @@ describe('Test video channels', function () {
 
     {
       const videoChannel = {
+        name: 'second_video_channel',
         displayName: 'second video channel',
         description: 'super video channel description',
         support: 'super video channel support text'
       }
       const res = await addVideoChannel(servers[ 0 ].url, servers[ 0 ].accessToken, videoChannel)
       secondVideoChannelId = res.body.videoChannel.id
-      secondVideoChannelUUID = res.body.videoChannel.uuid
     }
 
     // The channel is 1 is propagated to servers 2
@@ -99,7 +97,10 @@ describe('Test video channels', function () {
     expect(userInfo.videoChannels).to.have.lengthOf(2)
 
     const videoChannels = userInfo.videoChannels
-    expect(videoChannels[0].displayName).to.equal('Default root channel')
+    expect(videoChannels[0].name).to.equal('root_channel')
+    expect(videoChannels[0].displayName).to.equal('Main root channel')
+
+    expect(videoChannels[1].name).to.equal('second_video_channel')
     expect(videoChannels[1].displayName).to.equal('second video channel')
     expect(videoChannels[1].description).to.equal('super video channel description')
     expect(videoChannels[1].support).to.equal('super video channel support text')
@@ -112,7 +113,10 @@ describe('Test video channels', function () {
     expect(res.body.data).to.have.lengthOf(2)
 
     const videoChannels = res.body.data
-    expect(videoChannels[0].displayName).to.equal('Default root channel')
+    expect(videoChannels[0].name).to.equal('root_channel')
+    expect(videoChannels[0].displayName).to.equal('Main root channel')
+
+    expect(videoChannels[1].name).to.equal('second_video_channel')
     expect(videoChannels[1].displayName).to.equal('second video channel')
     expect(videoChannels[1].description).to.equal('super video channel description')
     expect(videoChannels[1].support).to.equal('super video channel support text')
@@ -125,6 +129,7 @@ describe('Test video channels', function () {
     expect(res.body.data).to.have.lengthOf(1)
 
     const videoChannels = res.body.data
+    expect(videoChannels[0].name).to.equal('second_video_channel')
     expect(videoChannels[0].displayName).to.equal('second video channel')
     expect(videoChannels[0].description).to.equal('super video channel description')
     expect(videoChannels[0].support).to.equal('super video channel support text')
@@ -136,7 +141,8 @@ describe('Test video channels', function () {
     expect(res.body.total).to.equal(2)
     expect(res.body.data).to.be.an('array')
     expect(res.body.data).to.have.lengthOf(1)
-    expect(res.body.data[0].displayName).to.equal('Default root channel')
+    expect(res.body.data[0].name).to.equal('root_channel')
+    expect(res.body.data[0].displayName).to.equal('Main root channel')
   })
 
   it('Should update video channel', async function () {
@@ -148,7 +154,7 @@ describe('Test video channels', function () {
       support: 'video channel support text updated'
     }
 
-    await updateVideoChannel(servers[0].url, servers[0].accessToken, secondVideoChannelId, videoChannelAttributes)
+    await updateVideoChannel(servers[0].url, servers[0].accessToken, 'second_video_channel', videoChannelAttributes)
 
     await waitJobs(servers)
   })
@@ -160,6 +166,7 @@ describe('Test video channels', function () {
       expect(res.body.total).to.equal(2)
       expect(res.body.data).to.be.an('array')
       expect(res.body.data).to.have.lengthOf(1)
+      expect(res.body.data[0].name).to.equal('second_video_channel')
       expect(res.body.data[0].displayName).to.equal('video channel updated')
       expect(res.body.data[0].description).to.equal('video channel description updated')
       expect(res.body.data[0].support).to.equal('video channel support text updated')
@@ -174,7 +181,7 @@ describe('Test video channels', function () {
     await updateVideoChannelAvatar({
       url: servers[0].url,
       accessToken: servers[0].accessToken,
-      videoChannelId: secondVideoChannelId,
+      videoChannelName: 'second_video_channel',
       fixture
     })
 
@@ -192,9 +199,10 @@ describe('Test video channels', function () {
   })
 
   it('Should get video channel', async function () {
-    const res = await getVideoChannel(servers[0].url, secondVideoChannelId)
+    const res = await getVideoChannel(servers[0].url, 'second_video_channel')
 
     const videoChannel = res.body
+    expect(videoChannel.name).to.equal('second_video_channel')
     expect(videoChannel.displayName).to.equal('video channel updated')
     expect(videoChannel.description).to.equal('video channel description updated')
     expect(videoChannel.support).to.equal('video channel support text updated')
@@ -204,7 +212,8 @@ describe('Test video channels', function () {
     this.timeout(10000)
 
     for (const server of servers) {
-      const res1 = await getVideoChannelVideos(server.url, server.accessToken, secondVideoChannelUUID, 0, 5)
+      const channelURI = 'second_video_channel@localhost:9001'
+      const res1 = await getVideoChannelVideos(server.url, server.accessToken, channelURI, 0, 5)
       expect(res1.body.total).to.equal(1)
       expect(res1.body.data).to.be.an('array')
       expect(res1.body.data).to.have.lengthOf(1)
@@ -224,10 +233,12 @@ describe('Test video channels', function () {
     this.timeout(10000)
 
     for (const server of servers) {
-      const res1 = await getVideoChannelVideos(server.url, server.accessToken, secondVideoChannelUUID, 0, 5)
+      const secondChannelURI = 'second_video_channel@localhost:9001'
+      const res1 = await getVideoChannelVideos(server.url, server.accessToken, secondChannelURI, 0, 5)
       expect(res1.body.total).to.equal(0)
 
-      const res2 = await getVideoChannelVideos(server.url, server.accessToken, firstVideoChannelUUID, 0, 5)
+      const channelURI = 'root_channel@localhost:9001'
+      const res2 = await getVideoChannelVideos(server.url, server.accessToken, channelURI, 0, 5)
       expect(res2.body.total).to.equal(1)
 
       const videos: Video[] = res2.body.data
@@ -238,7 +249,7 @@ describe('Test video channels', function () {
   })
 
   it('Should delete video channel', async function () {
-    await deleteVideoChannel(servers[0].url, servers[0].accessToken, secondVideoChannelId)
+    await deleteVideoChannel(servers[0].url, servers[0].accessToken, 'second_video_channel')
   })
 
   it('Should have video channel deleted', async function () {
@@ -247,7 +258,23 @@ describe('Test video channels', function () {
     expect(res.body.total).to.equal(1)
     expect(res.body.data).to.be.an('array')
     expect(res.body.data).to.have.lengthOf(1)
-    expect(res.body.data[0].displayName).to.equal('Default root channel')
+    expect(res.body.data[0].displayName).to.equal('Main root channel')
+  })
+
+  it('Should create the main channel with an uuid if there is a conflict', async function () {
+    {
+      const videoChannel = { name: 'toto_channel', displayName: 'My toto channel' }
+      await addVideoChannel(servers[ 0 ].url, servers[ 0 ].accessToken, videoChannel)
+    }
+
+    {
+      await createUser(servers[ 0 ].url, servers[ 0 ].accessToken, 'toto', 'password')
+      const accessToken = await userLogin(servers[ 0 ], { username: 'toto', password: 'password' })
+
+      const res = await getMyUserInformation(servers[ 0 ].url, accessToken)
+      const videoChannel = res.body.videoChannels[ 0 ]
+      expect(videoChannel.name).to.match(/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/)
+    }
   })
 
   after(async function () {
diff --git a/server/tests/cli/update-host.ts b/server/tests/cli/update-host.ts
index 968b7bd7f..7f54c0e70 100644
--- a/server/tests/cli/update-host.ts
+++ b/server/tests/cli/update-host.ts
@@ -54,6 +54,7 @@ describe('Test update host scripts', function () {
 
     // Create channel
     const videoChannel = {
+      name: 'second_channel',
       displayName: 'second video channel',
       description: 'super video channel description'
     }
diff --git a/server/tests/real-world/populate-database.ts b/server/tests/real-world/populate-database.ts
index d41ac8d36..a7fdbd1dc 100644
--- a/server/tests/real-world/populate-database.ts
+++ b/server/tests/real-world/populate-database.ts
@@ -66,6 +66,7 @@ function getRandomInt (min, max) {
 
 function createCustomChannel (server: ServerInfo) {
   const videoChannel = {
+    name: Date.now().toString(),
     displayName: Date.now().toString(),
     description: Date.now().toString()
   }
diff --git a/server/tests/utils/videos/video-channels.ts b/server/tests/utils/videos/video-channels.ts
index 3ca39469c..1eea22b31 100644
--- a/server/tests/utils/videos/video-channels.ts
+++ b/server/tests/utils/videos/video-channels.ts
@@ -97,10 +97,10 @@ function updateVideoChannelAvatar (options: {
   url: string,
   accessToken: string,
   fixture: string,
-  videoChannelId: string | number
+  videoChannelName: string | number
 }) {
 
-  const path = '/api/v1/video-channels/' + options.videoChannelId + '/avatar/pick'
+  const path = '/api/v1/video-channels/' + options.videoChannelName + '/avatar/pick'
 
   return updateAvatarRequest(Object.assign(options, { path }))
 }
diff --git a/server/tests/utils/videos/videos.ts b/server/tests/utils/videos/videos.ts
index b280cccda..592248144 100644
--- a/server/tests/utils/videos/videos.ts
+++ b/server/tests/utils/videos/videos.ts
@@ -199,13 +199,13 @@ function getAccountVideos (
 function getVideoChannelVideos (
   url: string,
   accessToken: string,
-  videoChannelId: number | string,
+  videoChannelName: string,
   start: number,
   count: number,
   sort?: string,
   query: { nsfw?: boolean } = {}
 ) {
-  const path = '/api/v1/video-channels/' + videoChannelId + '/videos'
+  const path = '/api/v1/video-channels/' + videoChannelName + '/videos'
 
   return makeGetRequest({
     url,