X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fcli%2Fupdate-host.ts;h=ad56f7b1b4e8cf7dcfba0437cb95181485d14085;hb=28be89161aab245526d64f6fb7dd29391a97fe0a;hp=644b3807e390dedacf0a3a14c9e11716716f6a48;hpb=e95561cdf195d2926e1856ed285c2b86960bc86f;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/tests/cli/update-host.ts b/server/tests/cli/update-host.ts
index 644b3807e..ad56f7b1b 100644
--- a/server/tests/cli/update-host.ts
+++ b/server/tests/cli/update-host.ts
@@ -1,5 +1,8 @@
+/* tslint:disable:no-unused-expression */
+
 import 'mocha'
 import * as chai from 'chai'
+import { VideoDetails } from '../../../shared/models/videos'
 const expect = chai.expect
 
 import {
@@ -12,14 +15,16 @@ import {
   runServer,
   ServerInfo,
   setAccessTokensToServers,
-  uploadVideo
+  uploadVideo,
+  wait,
+  getVideo
 } from '../utils'
 
 describe('Test update host scripts', function () {
   let server: ServerInfo
 
   before(async function () {
-    this.timeout(30000)
+    this.timeout(60000)
 
     await flushTests()
 
@@ -28,36 +33,51 @@ describe('Test update host scripts', function () {
         port: 9256
       }
     }
-    server = await runServer(1, overrideConfig)
+    // Run server 2 to have transcoding enabled
+    server = await runServer(2, overrideConfig)
     await setAccessTokensToServers([ server ])
 
     // Upload two videos for our needs
     const videoAttributes = {}
     await uploadVideo(server.url, server.accessToken, videoAttributes)
     await uploadVideo(server.url, server.accessToken, videoAttributes)
+    await wait(30000)
   })
 
   it('Should update torrent hosts', async function () {
     this.timeout(30000)
 
     killallServers([ server ])
-    server = await runServer(1)
+    // Run server with standard configuration
+    server = await runServer(2)
 
     const env = getEnvCli(server)
     await execCLI(`${env} npm run update-host`)
 
     const res = await getVideosList(server.url)
     const videos = res.body.data
+    expect(videos).to.have.lengthOf(2)
+
+    for (const video of videos) {
+      const res2 = await getVideo(server.url, video.id)
+      const videoDetails: VideoDetails = res2.body
+
+      expect(videoDetails.files).to.have.lengthOf(4)
 
-    expect(videos[0].files[0].magnetUri).to.contain('localhost%3A9001%2Ftracker%2Fsocket')
-    expect(videos[0].files[0].magnetUri).to.contain('localhost%3A9001%2Fstatic%2Fwebseed%2F')
+      for (const file of videoDetails.files) {
+        expect(file.magnetUri).to.contain('localhost%3A9002%2Ftracker%2Fsocket')
+        expect(file.magnetUri).to.contain('localhost%3A9002%2Fstatic%2Fwebseed%2F')
 
-    expect(videos[1].files[0].magnetUri).to.contain('localhost%3A9001%2Ftracker%2Fsocket')
-    expect(videos[1].files[0].magnetUri).to.contain('localhost%3A9001%2Fstatic%2Fwebseed%2F')
+        const torrent = await parseTorrentVideo(server, videoDetails.uuid, file.resolution.id)
+        const announceWS = torrent.announce.find(a => a === 'ws://localhost:9002/tracker/socket')
+        expect(announceWS).to.not.be.undefined
 
-    const torrent = await parseTorrentVideo(server, videos[0].uuid)
-    expect(torrent.announce[0]).to.equal('ws://localhost:9001/tracker/socket')
-    expect(torrent.urlList[0]).to.contain('http://localhost:9001/static/webseed')
+        const announceHttp = torrent.announce.find(a => a === 'http://localhost:9002/tracker/announce')
+        expect(announceHttp).to.not.be.undefined
+
+        expect(torrent.urlList[0]).to.contain('http://localhost:9002/static/webseed')
+      }
+    }
   })
 
   after(async function () {