diff options
| author | Chocobozzz <me@florianbigard.com> | 2019-02-06 12:26:58 +0100 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2019-02-06 12:26:58 +0100 |
| commit | 73471b1a52f242e86364ffb077ea6cadb3b07ae2 (patch) | |
| tree | 43dbb7748e281f8d80f15326f489cdea10ec857d /server/tests/cli/create-transcoding-job.ts | |
| parent | c22419dd265c0c7185bf4197a1cb286eb3d8ebc0 (diff) | |
| parent | f5305c04aae14467d6f957b713c5a902275cbb89 (diff) | |
| download | PeerTube-73471b1a52f242e86364ffb077ea6cadb3b07ae2.tar.gz PeerTube-73471b1a52f242e86364ffb077ea6cadb3b07ae2.tar.zst PeerTube-73471b1a52f242e86364ffb077ea6cadb3b07ae2.zip | |
Merge branch 'release/v1.2.0'
Diffstat (limited to 'server/tests/cli/create-transcoding-job.ts')
| -rw-r--r-- | server/tests/cli/create-transcoding-job.ts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/server/tests/cli/create-transcoding-job.ts b/server/tests/cli/create-transcoding-job.ts index c2e3840c5..50be5fa19 100644 --- a/server/tests/cli/create-transcoding-job.ts +++ b/server/tests/cli/create-transcoding-job.ts | |||
| @@ -15,8 +15,8 @@ import { | |||
| 15 | ServerInfo, | 15 | ServerInfo, |
| 16 | setAccessTokensToServers, | 16 | setAccessTokensToServers, |
| 17 | uploadVideo, wait | 17 | uploadVideo, wait |
| 18 | } from '../utils' | 18 | } from '../../../shared/utils' |
| 19 | import { waitJobs } from '../utils/server/jobs' | 19 | import { waitJobs } from '../../../shared/utils/server/jobs' |
| 20 | 20 | ||
| 21 | const expect = chai.expect | 21 | const expect = chai.expect |
| 22 | 22 | ||