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/real-world | |
| 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/real-world')
| -rw-r--r-- | server/tests/real-world/populate-database.ts | 2 | ||||
| -rw-r--r-- | server/tests/real-world/real-world.ts | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/server/tests/real-world/populate-database.ts b/server/tests/real-world/populate-database.ts index a7fdbd1dc..016503498 100644 --- a/server/tests/real-world/populate-database.ts +++ b/server/tests/real-world/populate-database.ts | |||
| @@ -10,7 +10,7 @@ import { | |||
| 10 | ServerInfo, | 10 | ServerInfo, |
| 11 | setAccessTokensToServers, | 11 | setAccessTokensToServers, |
| 12 | uploadVideo | 12 | uploadVideo |
| 13 | } from '../utils' | 13 | } from '../../../shared/utils' |
| 14 | import * as Bluebird from 'bluebird' | 14 | import * as Bluebird from 'bluebird' |
| 15 | 15 | ||
| 16 | start() | 16 | start() |
diff --git a/server/tests/real-world/real-world.ts b/server/tests/real-world/real-world.ts index a96469b11..ac3baaf9a 100644 --- a/server/tests/real-world/real-world.ts +++ b/server/tests/real-world/real-world.ts | |||
| @@ -16,8 +16,8 @@ import { | |||
| 16 | updateVideo, | 16 | updateVideo, |
| 17 | uploadVideo, viewVideo, | 17 | uploadVideo, viewVideo, |
| 18 | wait | 18 | wait |
| 19 | } from '../utils' | 19 | } from '../../../shared/utils' |
| 20 | import { getJobsListPaginationAndSort } from '../utils/server/jobs' | 20 | import { getJobsListPaginationAndSort } from '../../../shared/utils/server/jobs' |
| 21 | 21 | ||
| 22 | interface ServerInfo extends DefaultServerInfo { | 22 | interface ServerInfo extends DefaultServerInfo { |
| 23 | requestsNumber: number | 23 | requestsNumber: number |