3 files changed, 28 insertions, 28 deletions

diff --git a/server/tests/api/users/user-subscriptions.ts b/server/tests/api/users/user-subscriptions.ts
index fbeca7d67..b45cfe67e 100644
--- a/server/tests/api/users/user-subscriptions.ts
+++ b/server/tests/api/users/user-subscriptions.ts
@@ -63,8 +63,8 @@ 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(60000)
 
-      await command.add({ token: users[0].accessToken, targetUri: 'user3_channel@localhost:' + servers[2].port })
-      await command.add({ token: users[0].accessToken, targetUri: 'root_channel@localhost:' + servers[0].port })
+      await command.add({ token: users[0].accessToken, targetUri: 'user3_channel@' + servers[2].host })
+      await command.add({ token: users[0].accessToken, targetUri: 'root_channel@' + servers[0].host })
 
       await waitJobs(servers)
 
@@ -112,20 +112,20 @@ describe('Test users subscriptions', function () {
 
     it('Should get subscription', async function () {
       {
-        const videoChannel = await command.get({ token: users[0].accessToken, uri: 'user3_channel@localhost:' + servers[2].port })
+        const videoChannel = await command.get({ token: users[0].accessToken, uri: 'user3_channel@' + servers[2].host })
 
         expect(videoChannel.name).to.equal('user3_channel')
-        expect(videoChannel.host).to.equal('localhost:' + servers[2].port)
+        expect(videoChannel.host).to.equal(servers[2].host)
         expect(videoChannel.displayName).to.equal('Main user3 channel')
         expect(videoChannel.followingCount).to.equal(0)
         expect(videoChannel.followersCount).to.equal(1)
       }
 
       {
-        const videoChannel = await command.get({ token: users[0].accessToken, uri: 'root_channel@localhost:' + servers[0].port })
+        const videoChannel = await command.get({ token: users[0].accessToken, uri: 'root_channel@' + servers[0].host })
 
         expect(videoChannel.name).to.equal('root_channel')
-        expect(videoChannel.host).to.equal('localhost:' + servers[0].port)
+        expect(videoChannel.host).to.equal(servers[0].host)
         expect(videoChannel.displayName).to.equal('Main root channel')
         expect(videoChannel.followingCount).to.equal(0)
         expect(videoChannel.followersCount).to.equal(1)
@@ -134,18 +134,18 @@ describe('Test users subscriptions', function () {
 
     it('Should return the existing subscriptions', async function () {
       const uris = [
-        'user3_channel@localhost:' + servers[2].port,
-        'root2_channel@localhost:' + servers[0].port,
-        'root_channel@localhost:' + servers[0].port,
-        'user3_channel@localhost:' + servers[0].port
+        'user3_channel@' + servers[2].host,
+        'root2_channel@' + servers[0].host,
+        'root_channel@' + servers[0].host,
+        'user3_channel@' + servers[0].host
       ]
 
       const body = await command.exist({ token: users[0].accessToken, uris })
 
-      expect(body['user3_channel@localhost:' + servers[2].port]).to.be.true
-      expect(body['root2_channel@localhost:' + servers[0].port]).to.be.false
-      expect(body['root_channel@localhost:' + servers[0].port]).to.be.true
-      expect(body['user3_channel@localhost:' + servers[0].port]).to.be.false
+      expect(body['user3_channel@' + servers[2].host]).to.be.true
+      expect(body['root2_channel@' + servers[0].host]).to.be.false
+      expect(body['root_channel@' + servers[0].host]).to.be.true
+      expect(body['user3_channel@' + servers[0].host]).to.be.false
     })
 
     it('Should search among subscriptions', async function () {
@@ -305,7 +305,7 @@ describe('Test users subscriptions', function () {
     it('Should remove user of server 3 subscription', async function () {
       this.timeout(30000)
 
-      await command.remove({ token: users[0].accessToken, uri: 'user3_channel@localhost:' + servers[2].port })
+      await command.remove({ token: users[0].accessToken, uri: 'user3_channel@' + servers[2].host })
 
       await waitJobs(servers)
     })
@@ -324,7 +324,7 @@ describe('Test users subscriptions', function () {
     it('Should remove the root subscription and not display the videos anymore', async function () {
       this.timeout(30000)
 
-      await command.remove({ token: users[0].accessToken, uri: 'root_channel@localhost:' + servers[0].port })
+      await command.remove({ token: users[0].accessToken, uri: 'root_channel@' + servers[0].host })
 
       await waitJobs(servers)
 
@@ -355,7 +355,7 @@ describe('Test users subscriptions', function () {
     it('Should follow user of server 3 again', async function () {
       this.timeout(60000)
 
-      await command.add({ token: users[0].accessToken, targetUri: 'user3_channel@localhost:' + servers[2].port })
+      await command.add({ token: users[0].accessToken, targetUri: 'user3_channel@' + servers[2].host })
 
       await waitJobs(servers)
 
@@ -389,8 +389,8 @@ describe('Test users subscriptions', function () {
 
       await servers[2].channels.create({ token: users[2].accessToken, attributes: { name: 'user3_channel2' } })
 
-      await servers[2].subscriptions.add({ token: servers[2].accessToken, targetUri: 'user3_channel@localhost:' + servers[2].port })
-      await servers[2].subscriptions.add({ token: servers[2].accessToken, targetUri: 'user3_channel2@localhost:' + servers[2].port })
+      await servers[2].subscriptions.add({ token: servers[2].accessToken, targetUri: 'user3_channel@' + servers[2].host })
+      await servers[2].subscriptions.add({ token: servers[2].accessToken, targetUri: 'user3_channel2@' + servers[2].host })
 
       await waitJobs(servers)
     })
diff --git a/server/tests/api/users/users-multiple-servers.ts b/server/tests/api/users/users-multiple-servers.ts
index 188e6f137..f94191b04 100644
--- a/server/tests/api/users/users-multiple-servers.ts
+++ b/server/tests/api/users/users-multiple-servers.ts
@@ -111,7 +111,7 @@ describe('Test users with multiple servers', function () {
     for (const server of servers) {
       const body = await server.accounts.list({ sort: '-createdAt' })
 
-      const resList = body.data.find(a => a.name === 'root' && a.host === 'localhost:' + servers[0].port)
+      const resList = body.data.find(a => a.name === 'root' && a.host === servers[0].host)
       expect(resList).not.to.be.undefined
 
       const account = await server.accounts.get({ accountName: resList.name + '@' + resList.host })
@@ -119,7 +119,7 @@ describe('Test users with multiple servers', function () {
       if (!createdAt) createdAt = account.createdAt
 
       expect(account.name).to.equal('root')
-      expect(account.host).to.equal('localhost:' + servers[0].port)
+      expect(account.host).to.equal(servers[0].host)
       expect(account.displayName).to.equal('my super display name')
       expect(account.description).to.equal('my super description updated')
       expect(createdAt).to.equal(account.createdAt)
@@ -138,7 +138,7 @@ describe('Test users with multiple servers', function () {
 
   it('Should list account videos', async function () {
     for (const server of servers) {
-      const { total, data } = await server.videos.listByAccount({ handle: 'user1@localhost:' + servers[0].port })
+      const { total, data } = await server.videos.listByAccount({ handle: 'user1@' + servers[0].host })
 
       expect(total).to.equal(1)
       expect(data).to.be.an('array')
@@ -155,7 +155,7 @@ describe('Test users with multiple servers', function () {
     await waitJobs(servers)
 
     for (const server of servers) {
-      const { total, data } = await server.videos.listByAccount({ handle: 'user1@localhost:' + servers[0].port, search: 'Kami' })
+      const { total, data } = await server.videos.listByAccount({ handle: 'user1@' + servers[0].host, search: 'Kami' })
 
       expect(total).to.equal(1)
       expect(data).to.be.an('array')
@@ -170,11 +170,11 @@ describe('Test users with multiple servers', function () {
     for (const server of servers) {
       const body = await server.accounts.list({ sort: '-createdAt' })
 
-      const accountDeleted = body.data.find(a => a.name === 'user1' && a.host === 'localhost:' + servers[0].port)
+      const accountDeleted = body.data.find(a => a.name === 'user1' && a.host === servers[0].host)
       expect(accountDeleted).not.to.be.undefined
 
       const { data } = await server.channels.list()
-      const videoChannelDeleted = data.find(a => a.displayName === 'Main user1 channel' && a.host === 'localhost:' + servers[0].port)
+      const videoChannelDeleted = data.find(a => a.displayName === 'Main user1 channel' && a.host === servers[0].host)
       expect(videoChannelDeleted).not.to.be.undefined
     }
 
@@ -185,11 +185,11 @@ describe('Test users with multiple servers', function () {
     for (const server of servers) {
       const body = await server.accounts.list({ sort: '-createdAt' })
 
-      const accountDeleted = body.data.find(a => a.name === 'user1' && a.host === 'localhost:' + servers[0].port)
+      const accountDeleted = body.data.find(a => a.name === 'user1' && a.host === servers[0].host)
       expect(accountDeleted).to.be.undefined
 
       const { data } = await server.channels.list()
-      const videoChannelDeleted = data.find(a => a.name === 'Main user1 channel' && a.host === 'localhost:' + servers[0].port)
+      const videoChannelDeleted = data.find(a => a.name === 'Main user1 channel' && a.host === servers[0].host)
       expect(videoChannelDeleted).to.be.undefined
     }
   })
diff --git a/server/tests/api/users/users-verification.ts b/server/tests/api/users/users-verification.ts
index fc082383a..19a8df9e1 100644
--- a/server/tests/api/users/users-verification.ts
+++ b/server/tests/api/users/users-verification.ts
@@ -28,7 +28,7 @@ describe('Test users account verification', function () {
 
     const overrideConfig = {
       smtp: {
-        hostname: 'localhost',
+        hostname: '127.0.0.1',
         port
       }
     }