diff options
Diffstat (limited to 'server')
-rw-r--r-- | server/tests/peertube-runner/client-cli.ts | 2 | ||||
-rw-r--r-- | server/tests/peertube-runner/live-transcoding.ts | 2 | ||||
-rw-r--r-- | server/tests/peertube-runner/studio-transcoding.ts | 2 | ||||
-rw-r--r-- | server/tests/peertube-runner/vod-transcoding.ts | 2 | ||||
-rw-r--r-- | server/tests/shared/peertube-runner-process.ts | 8 |
5 files changed, 10 insertions, 6 deletions
diff --git a/server/tests/peertube-runner/client-cli.ts b/server/tests/peertube-runner/client-cli.ts index cc8136c4a..5cbdc4e77 100644 --- a/server/tests/peertube-runner/client-cli.ts +++ b/server/tests/peertube-runner/client-cli.ts | |||
@@ -53,7 +53,7 @@ describe('Test peertube-runner program client CLI', function () { | |||
53 | }) | 53 | }) |
54 | 54 | ||
55 | it('Should unregister the PeerTube instance', async function () { | 55 | it('Should unregister the PeerTube instance', async function () { |
56 | await peertubeRunner.unregisterPeerTubeInstance() | 56 | await peertubeRunner.unregisterPeerTubeInstance({ runnerName: 'my super runner' }) |
57 | }) | 57 | }) |
58 | 58 | ||
59 | 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 c2ca1de96..4826c61f7 100644 --- a/server/tests/peertube-runner/live-transcoding.ts +++ b/server/tests/peertube-runner/live-transcoding.ts | |||
@@ -190,7 +190,7 @@ describe('Test Live transcoding in peertube-runner program', function () { | |||
190 | 190 | ||
191 | after(async function () { | 191 | after(async function () { |
192 | if (peertubeRunner) { | 192 | if (peertubeRunner) { |
193 | await peertubeRunner.unregisterPeerTubeInstance() | 193 | await peertubeRunner.unregisterPeerTubeInstance({ runnerName: 'runner' }) |
194 | peertubeRunner.kill() | 194 | peertubeRunner.kill() |
195 | } | 195 | } |
196 | 196 | ||
diff --git a/server/tests/peertube-runner/studio-transcoding.ts b/server/tests/peertube-runner/studio-transcoding.ts index 69b38a536..988201947 100644 --- a/server/tests/peertube-runner/studio-transcoding.ts +++ b/server/tests/peertube-runner/studio-transcoding.ts | |||
@@ -115,7 +115,7 @@ describe('Test studio transcoding in peertube-runner program', function () { | |||
115 | 115 | ||
116 | after(async function () { | 116 | after(async function () { |
117 | if (peertubeRunner) { | 117 | if (peertubeRunner) { |
118 | await peertubeRunner.unregisterPeerTubeInstance() | 118 | await peertubeRunner.unregisterPeerTubeInstance({ runnerName: 'runner' }) |
119 | peertubeRunner.kill() | 119 | peertubeRunner.kill() |
120 | } | 120 | } |
121 | 121 | ||
diff --git a/server/tests/peertube-runner/vod-transcoding.ts b/server/tests/peertube-runner/vod-transcoding.ts index aefec394d..c3f41c097 100644 --- a/server/tests/peertube-runner/vod-transcoding.ts +++ b/server/tests/peertube-runner/vod-transcoding.ts | |||
@@ -341,7 +341,7 @@ describe('Test VOD transcoding in peertube-runner program', function () { | |||
341 | 341 | ||
342 | after(async function () { | 342 | after(async function () { |
343 | if (peertubeRunner) { | 343 | if (peertubeRunner) { |
344 | await peertubeRunner.unregisterPeerTubeInstance() | 344 | await peertubeRunner.unregisterPeerTubeInstance({ runnerName: 'runner' }) |
345 | peertubeRunner.kill() | 345 | peertubeRunner.kill() |
346 | } | 346 | } |
347 | 347 | ||
diff --git a/server/tests/shared/peertube-runner-process.ts b/server/tests/shared/peertube-runner-process.ts index b3c8dfe0e..9304ebcc8 100644 --- a/server/tests/shared/peertube-runner-process.ts +++ b/server/tests/shared/peertube-runner-process.ts | |||
@@ -60,8 +60,12 @@ export class PeerTubeRunnerProcess { | |||
60 | return execa.node(this.getRunnerPath(), args) | 60 | return execa.node(this.getRunnerPath(), args) |
61 | } | 61 | } |
62 | 62 | ||
63 | unregisterPeerTubeInstance () { | 63 | unregisterPeerTubeInstance (options: { |
64 | const args = [ 'unregister', '--url', this.server.url, ...this.buildIdArg() ] | 64 | runnerName: string |
65 | }) { | ||
66 | const { runnerName } = options | ||
67 | |||
68 | const args = [ 'unregister', '--url', this.server.url, '--runner-name', runnerName, ...this.buildIdArg() ] | ||
65 | return execa.node(this.getRunnerPath(), args) | 69 | return execa.node(this.getRunnerPath(), args) |
66 | } | 70 | } |
67 | 71 | ||