diff options
| author | Chocobozzz <me@florianbigard.com> | 2019-02-11 11:52:34 +0100 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2019-02-11 11:52:34 +0100 |
| commit | 88108880bbdba473cfe36ecbebc1c3c4f972e102 (patch) | |
| tree | b242efb3b4f0d7e49d88f2d1f2063b5b3b0489c0 /server/tests/real-world | |
| parent | 53a94c7cfa8368da4cd248d65df8346905938f0c (diff) | |
| parent | 9b712a2017e4ab3cf12cd6bd58278905520159d0 (diff) | |
| download | PeerTube-88108880bbdba473cfe36ecbebc1c3c4f972e102.tar.gz PeerTube-88108880bbdba473cfe36ecbebc1c3c4f972e102.tar.zst PeerTube-88108880bbdba473cfe36ecbebc1c3c4f972e102.zip | |
Merge branch 'develop' into pr/1217
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 |