diff options
| author | Chocobozzz <me@florianbigard.com> | 2022-06-24 10:33:26 +0200 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2022-06-24 10:33:26 +0200 |
| commit | 4e56f0fff12ab9840574e7a27277fc78b195b3e2 (patch) | |
| tree | 90486e58f51d714f46d5635b91000e82be41b785 /server | |
| parent | 58e7850615e2cf8de64a16929c6f04310f99f330 (diff) | |
| parent | c3fb12b31f8367394df4eb5718e4059e167782d8 (diff) | |
| download | PeerTube-4e56f0fff12ab9840574e7a27277fc78b195b3e2.tar.gz PeerTube-4e56f0fff12ab9840574e7a27277fc78b195b3e2.tar.zst PeerTube-4e56f0fff12ab9840574e7a27277fc78b195b3e2.zip | |
Merge branch 'release/4.2.0' into develop
Diffstat (limited to 'server')
| -rw-r--r-- | server/tests/api/live/live-fast-restream.ts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/server/tests/api/live/live-fast-restream.ts b/server/tests/api/live/live-fast-restream.ts index b524cbe7f..fb4ae147c 100644 --- a/server/tests/api/live/live-fast-restream.ts +++ b/server/tests/api/live/live-fast-restream.ts | |||
| @@ -102,7 +102,7 @@ describe('Fast restream in live', function () { | |||
| 102 | before(async function () { | 102 | before(async function () { |
| 103 | this.timeout(120000) | 103 | this.timeout(120000) |
| 104 | 104 | ||
| 105 | const env = { 'PEERTUBE_TEST_CONSTANTS_VIDEO_LIVE_CLEANUP_DELAY': '10000' } | 105 | const env = { PEERTUBE_TEST_CONSTANTS_VIDEO_LIVE_CLEANUP_DELAY: '10000' } |
| 106 | server = await createSingleServer(1, {}, { env }) | 106 | server = await createSingleServer(1, {}, { env }) |
| 107 | 107 | ||
| 108 | // Get the access tokens | 108 | // Get the access tokens |