Merge branch 'release/3.3.0' into develop

[github/Chocobozzz/PeerTube.git] / server / tests / api / server / tracker.ts

diff --git a/server/tests/api/server/tracker.ts b/server/tests/api/server/tracker.ts
index 032012edf58d4e4ba3cd486a9cb0840e05b533f9..f597ac60ce84504a4857976d78759a033340e050 100644 (file)
--- a/server/tests/api/server/tracker.ts
+++ b/server/tests/api/server/tracker.ts
@@ -3,21 +3,21 @@
 import 'mocha'
 import * as magnetUtil from 'magnet-uri'
 import * as WebTorrent from 'webtorrent'
-import { cleanupTests, flushAndRunServer, killallServers, reRunServer, ServerInfo, setAccessTokensToServers } from '@shared/extra-utils'
+import { cleanupTests, createSingleServer, killallServers, PeerTubeServer, setAccessTokensToServers } from '@shared/extra-utils'
 
 describe('Test tracker', function () {
-  let server: ServerInfo
+  let server: PeerTubeServer
   let badMagnet: string
   let goodMagnet: string
 
   before(async function () {
     this.timeout(60000)
-    server = await flushAndRunServer(1)
+    server = await createSingleServer(1)
     await setAccessTokensToServers([ server ])
 
     {
-      const { uuid } = await server.videosCommand.upload()
-      const video = await server.videosCommand.get({ id: uuid })
+      const { uuid } = await server.videos.upload()
+      const video = await server.videos.get({ id: uuid })
       goodMagnet = video.files[0].magnetUri
 
       const parsed = magnetUtil.decode(goodMagnet)
@@ -48,7 +48,7 @@ describe('Test tracker', function () {
     const errCb = () => done(new Error('Tracker is enabled'))
 
     killallServers([ server ])
-      .then(() => reRunServer(server, { tracker: { enabled: false } }))
+      .then(() => server.run({ tracker: { enabled: false } }))
       .then(() => {
         const webtorrent = new WebTorrent()
 
@@ -72,7 +72,7 @@ describe('Test tracker', function () {
     this.timeout(20000)
 
     killallServers([ server ])
-      .then(() => reRunServer(server))
+      .then(() => server.run())
       .then(() => {
         const webtorrent = new WebTorrent()