Remove unused actor uuid field

2 files changed, 11 insertions, 33 deletions

diff --git a/server/tests/api/users/users-multiple-servers.ts b/server/tests/api/users/users-multiple-servers.ts
index 988fdad3f..791418318 100644
--- a/server/tests/api/users/users-multiple-servers.ts
+++ b/server/tests/api/users/users-multiple-servers.ts
@@ -5,7 +5,8 @@ import 'mocha'
 import { Account } from '../../../../shared/models/actors'
 import {
   checkTmpIsEmpty,
-  checkVideoFilesWereRemoved, cleanupTests,
+  checkVideoFilesWereRemoved,
+  cleanupTests,
   createUser,
   doubleFollow,
   flushAndRunMultipleServers,
@@ -15,14 +16,7 @@ import {
   updateMyUser,
   userLogin
 } from '../../../../shared/extra-utils'
-import {
-  getMyUserInformation,
-  killallServers,
-  ServerInfo,
-  testImage,
-  updateMyAvatar,
-  uploadVideo
-} from '../../../../shared/extra-utils/index'
+import { getMyUserInformation, ServerInfo, testImage, updateMyAvatar, uploadVideo } from '../../../../shared/extra-utils/index'
 import { checkActorFilesWereRemoved, getAccount, getAccountsList } from '../../../../shared/extra-utils/users/accounts'
 import { setAccessTokensToServers } from '../../../../shared/extra-utils/users/login'
 import { User } from '../../../../shared/models/users'
@@ -34,12 +28,10 @@ const expect = chai.expect
 describe('Test users with multiple servers', function () {
   let servers: ServerInfo[] = []
   let user: User
-  let userAccountName: string
-  let userAccountUUID: string
-  let userVideoChannelUUID: string
   let userId: number
   let videoUUID: string
   let userAccessToken: string
+  let userAvatarFilename: string
 
   before(async function () {
     this.timeout(120000)
@@ -75,19 +67,6 @@ describe('Test users with multiple servers', function () {
     }
 
     {
-      const res = await getMyUserInformation(servers[0].url, userAccessToken)
-      const account: Account = res.body.account
-      userAccountName = account.name + '@' + account.host
-      userAccountUUID = account.uuid
-    }
-
-    {
-      const res = await getMyUserInformation(servers[ 0 ].url, servers[ 0 ].accessToken)
-      const user: User = res.body
-      userVideoChannelUUID = user.videoChannels[0].uuid
-    }
-
-    {
       const resVideo = await uploadVideo(servers[ 0 ].url, userAccessToken, {})
       videoUUID = resVideo.body.video.uuid
     }
@@ -106,6 +85,8 @@ describe('Test users with multiple servers', function () {
 
     const res = await getMyUserInformation(servers[0].url, servers[0].accessToken)
     user = res.body
+
+    const account: Account = user.account
     expect(user.account.displayName).to.equal('my super display name')
 
     await waitJobs(servers)
@@ -142,7 +123,9 @@ describe('Test users with multiple servers', function () {
     const res = await getMyUserInformation(servers[0].url, servers[0].accessToken)
     user = res.body
 
-    await testImage(servers[0].url, 'avatar2-resized', user.account.avatar.path, '.png')
+    userAvatarFilename = user.account.avatar.path
+
+    await testImage(servers[0].url, 'avatar2-resized', userAvatarFilename, '.png')
 
     await waitJobs(servers)
   })
@@ -173,7 +156,7 @@ describe('Test users with multiple servers', function () {
 
   it('Should list account videos', async function () {
     for (const server of servers) {
-      const res = await getAccountVideos(server.url, server.accessToken, userAccountName, 0, 5)
+      const res = await getAccountVideos(server.url, server.accessToken, 'user1@localhost:' + servers[0].port, 0, 5)
 
       expect(res.body.total).to.equal(1)
       expect(res.body.data).to.be.an('array')
@@ -218,8 +201,7 @@ describe('Test users with multiple servers', function () {
 
   it('Should not have actor files', async () => {
     for (const server of servers) {
-      await checkActorFilesWereRemoved(userAccountUUID, server.internalServerNumber)
-      await checkActorFilesWereRemoved(userVideoChannelUUID, server.internalServerNumber)
+      await checkActorFilesWereRemoved(userAvatarFilename, server.internalServerNumber)
     }
   })
 
diff --git a/server/tests/api/videos/video-channels.ts b/server/tests/api/videos/video-channels.ts
index e98f14ea8..2d298dd3f 100644
--- a/server/tests/api/videos/video-channels.ts
+++ b/server/tests/api/videos/video-channels.ts
@@ -18,12 +18,10 @@ import {
 import {
   addVideoChannel,
   deleteVideoChannel,
-  flushTests,
   getAccountVideoChannelsList,
   getMyUserInformation,
   getVideoChannel,
   getVideoChannelsList,
-  killallServers,
   ServerInfo,
   setAccessTokensToServers,
   updateVideoChannel
@@ -35,7 +33,6 @@ const expect = chai.expect
 describe('Test video channels', function () {
   let servers: ServerInfo[]
   let userInfo: User
-  let accountUUID: string
   let firstVideoChannelId: number
   let secondVideoChannelId: number
   let videoUUID: string
@@ -51,7 +48,6 @@ describe('Test video channels', function () {
     {
       const res = await getMyUserInformation(servers[0].url, servers[0].accessToken)
       const user: User = res.body
-      accountUUID = user.account.uuid
 
       firstVideoChannelId = user.videoChannels[0].id
     }