diff options
Diffstat (limited to 'server/tests/peertube-runner')
-rw-r--r-- | server/tests/peertube-runner/client-cli.ts | 5 | ||||
-rw-r--r-- | server/tests/peertube-runner/live-transcoding.ts | 8 | ||||
-rw-r--r-- | server/tests/peertube-runner/studio-transcoding.ts | 6 | ||||
-rw-r--r-- | server/tests/peertube-runner/vod-transcoding.ts | 6 |
4 files changed, 12 insertions, 13 deletions
diff --git a/server/tests/peertube-runner/client-cli.ts b/server/tests/peertube-runner/client-cli.ts index ff70e599f..cc8136c4a 100644 --- a/server/tests/peertube-runner/client-cli.ts +++ b/server/tests/peertube-runner/client-cli.ts | |||
@@ -18,7 +18,7 @@ describe('Test peertube-runner program client CLI', function () { | |||
18 | 18 | ||
19 | await server.config.enableRemoteTranscoding() | 19 | await server.config.enableRemoteTranscoding() |
20 | 20 | ||
21 | peertubeRunner = new PeerTubeRunnerProcess() | 21 | peertubeRunner = new PeerTubeRunnerProcess(server) |
22 | await peertubeRunner.runServer() | 22 | await peertubeRunner.runServer() |
23 | }) | 23 | }) |
24 | 24 | ||
@@ -32,7 +32,6 @@ describe('Test peertube-runner program client CLI', function () { | |||
32 | const registrationToken = await server.runnerRegistrationTokens.getFirstRegistrationToken() | 32 | const registrationToken = await server.runnerRegistrationTokens.getFirstRegistrationToken() |
33 | 33 | ||
34 | await peertubeRunner.registerPeerTubeInstance({ | 34 | await peertubeRunner.registerPeerTubeInstance({ |
35 | server, | ||
36 | registrationToken, | 35 | registrationToken, |
37 | runnerName: 'my super runner', | 36 | runnerName: 'my super runner', |
38 | runnerDescription: 'super description' | 37 | runnerDescription: 'super description' |
@@ -54,7 +53,7 @@ describe('Test peertube-runner program client CLI', function () { | |||
54 | }) | 53 | }) |
55 | 54 | ||
56 | it('Should unregister the PeerTube instance', async function () { | 55 | it('Should unregister the PeerTube instance', async function () { |
57 | await peertubeRunner.unregisterPeerTubeInstance({ server }) | 56 | await peertubeRunner.unregisterPeerTubeInstance() |
58 | }) | 57 | }) |
59 | 58 | ||
60 | it('Should not have PeerTube instance listed', async function () { | 59 | it('Should not have PeerTube instance listed', async function () { |
diff --git a/server/tests/peertube-runner/live-transcoding.ts b/server/tests/peertube-runner/live-transcoding.ts index 13a4cb4e9..c56f4cd84 100644 --- a/server/tests/peertube-runner/live-transcoding.ts +++ b/server/tests/peertube-runner/live-transcoding.ts | |||
@@ -1,5 +1,5 @@ | |||
1 | import { expect } from 'chai' | ||
2 | /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */ | 1 | /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */ |
2 | import { expect } from 'chai' | ||
3 | import { | 3 | import { |
4 | checkPeerTubeRunnerCacheIsEmpty, | 4 | checkPeerTubeRunnerCacheIsEmpty, |
5 | expectStartWith, | 5 | expectStartWith, |
@@ -144,9 +144,9 @@ describe('Test Live transcoding in peertube-runner program', function () { | |||
144 | 144 | ||
145 | const registrationToken = await servers[0].runnerRegistrationTokens.getFirstRegistrationToken() | 145 | const registrationToken = await servers[0].runnerRegistrationTokens.getFirstRegistrationToken() |
146 | 146 | ||
147 | peertubeRunner = new PeerTubeRunnerProcess() | 147 | peertubeRunner = new PeerTubeRunnerProcess(servers[0]) |
148 | await peertubeRunner.runServer() | 148 | await peertubeRunner.runServer() |
149 | await peertubeRunner.registerPeerTubeInstance({ server: servers[0], registrationToken, runnerName: 'runner' }) | 149 | await peertubeRunner.registerPeerTubeInstance({ registrationToken, runnerName: 'runner' }) |
150 | }) | 150 | }) |
151 | 151 | ||
152 | describe('With lives on local filesystem storage', function () { | 152 | describe('With lives on local filesystem storage', function () { |
@@ -184,7 +184,7 @@ describe('Test Live transcoding in peertube-runner program', function () { | |||
184 | 184 | ||
185 | after(async function () { | 185 | after(async function () { |
186 | if (peertubeRunner) { | 186 | if (peertubeRunner) { |
187 | await peertubeRunner.unregisterPeerTubeInstance({ server: servers[0] }) | 187 | await peertubeRunner.unregisterPeerTubeInstance() |
188 | peertubeRunner.kill() | 188 | peertubeRunner.kill() |
189 | } | 189 | } |
190 | 190 | ||
diff --git a/server/tests/peertube-runner/studio-transcoding.ts b/server/tests/peertube-runner/studio-transcoding.ts index e20cc9041..f60b83dbd 100644 --- a/server/tests/peertube-runner/studio-transcoding.ts +++ b/server/tests/peertube-runner/studio-transcoding.ts | |||
@@ -74,9 +74,9 @@ describe('Test studio transcoding in peertube-runner program', function () { | |||
74 | 74 | ||
75 | const registrationToken = await servers[0].runnerRegistrationTokens.getFirstRegistrationToken() | 75 | const registrationToken = await servers[0].runnerRegistrationTokens.getFirstRegistrationToken() |
76 | 76 | ||
77 | peertubeRunner = new PeerTubeRunnerProcess() | 77 | peertubeRunner = new PeerTubeRunnerProcess(servers[0]) |
78 | await peertubeRunner.runServer() | 78 | await peertubeRunner.runServer() |
79 | await peertubeRunner.registerPeerTubeInstance({ server: servers[0], registrationToken, runnerName: 'runner' }) | 79 | await peertubeRunner.registerPeerTubeInstance({ registrationToken, runnerName: 'runner' }) |
80 | }) | 80 | }) |
81 | 81 | ||
82 | describe('With videos on local filesystem storage', function () { | 82 | describe('With videos on local filesystem storage', function () { |
@@ -109,7 +109,7 @@ describe('Test studio transcoding in peertube-runner program', function () { | |||
109 | 109 | ||
110 | after(async function () { | 110 | after(async function () { |
111 | if (peertubeRunner) { | 111 | if (peertubeRunner) { |
112 | await peertubeRunner.unregisterPeerTubeInstance({ server: servers[0] }) | 112 | await peertubeRunner.unregisterPeerTubeInstance() |
113 | peertubeRunner.kill() | 113 | peertubeRunner.kill() |
114 | } | 114 | } |
115 | 115 | ||
diff --git a/server/tests/peertube-runner/vod-transcoding.ts b/server/tests/peertube-runner/vod-transcoding.ts index d7e2df095..02d839339 100644 --- a/server/tests/peertube-runner/vod-transcoding.ts +++ b/server/tests/peertube-runner/vod-transcoding.ts | |||
@@ -249,9 +249,9 @@ describe('Test VOD transcoding in peertube-runner program', function () { | |||
249 | 249 | ||
250 | const registrationToken = await servers[0].runnerRegistrationTokens.getFirstRegistrationToken() | 250 | const registrationToken = await servers[0].runnerRegistrationTokens.getFirstRegistrationToken() |
251 | 251 | ||
252 | peertubeRunner = new PeerTubeRunnerProcess() | 252 | peertubeRunner = new PeerTubeRunnerProcess(servers[0]) |
253 | await peertubeRunner.runServer() | 253 | await peertubeRunner.runServer() |
254 | await peertubeRunner.registerPeerTubeInstance({ server: servers[0], registrationToken, runnerName: 'runner' }) | 254 | await peertubeRunner.registerPeerTubeInstance({ registrationToken, runnerName: 'runner' }) |
255 | }) | 255 | }) |
256 | 256 | ||
257 | describe('With videos on local filesystem storage', function () { | 257 | describe('With videos on local filesystem storage', function () { |
@@ -335,7 +335,7 @@ describe('Test VOD transcoding in peertube-runner program', function () { | |||
335 | 335 | ||
336 | after(async function () { | 336 | after(async function () { |
337 | if (peertubeRunner) { | 337 | if (peertubeRunner) { |
338 | await peertubeRunner.unregisterPeerTubeInstance({ server: servers[0] }) | 338 | await peertubeRunner.unregisterPeerTubeInstance() |
339 | peertubeRunner.kill() | 339 | peertubeRunner.kill() |
340 | } | 340 | } |
341 | 341 | ||