addVideoChannel,
addVideoInPlaylist,
checkPlaylistFilesWereRemoved,
+ cleanupTests,
createUser,
createVideoPlaylist,
deleteVideoChannel,
deleteVideoPlaylist,
- doubleFollow, doVideosExistInMyPlaylist,
+ doubleFollow,
+ doVideosExistInMyPlaylist,
flushAndRunMultipleServers,
- flushTests,
getAccountPlaylistsList,
- getAccountPlaylistsListWithToken, getMyUserInformation,
+ getAccountPlaylistsListWithToken,
+ getMyUserInformation,
getPlaylistVideos,
getVideoChannelPlaylistsList,
getVideoPlaylist,
getVideoPlaylistPrivacies,
getVideoPlaylistsList,
getVideoPlaylistWithToken,
- killallServers,
removeUser,
removeVideoFromPlaylist,
reorderVideosPlaylist,
uploadVideoAndGetId,
userLogin,
waitJobs
-} from '../../../../shared/utils'
+} from '../../../../shared/extra-utils'
import { VideoPlaylistPrivacy } from '../../../../shared/models/videos/playlist/video-playlist-privacy.model'
import { VideoPlaylist } from '../../../../shared/models/videos/playlist/video-playlist.model'
import { Video } from '../../../../shared/models/videos'
for (const server of servers) {
const results = [
- await getAccountPlaylistsList(server.url, 'root@localhost:9002', 0, 5, '-createdAt'),
+ await getAccountPlaylistsList(server.url, 'root@localhost:' + servers[1].port, 0, 5, '-createdAt'),
await getVideoPlaylistsList(server.url, 0, 2, '-createdAt')
]
this.timeout(30000)
for (const server of servers) {
- await checkPlaylistFilesWereRemoved(playlistServer1UUID, server.serverNumber)
+ await checkPlaylistFilesWereRemoved(playlistServer1UUID, server.internalServerNumber)
}
})
this.timeout(30000)
const user = { username: 'user_1', password: 'password' }
- const res = await createUser(servers[0].url, servers[0].accessToken, user.username, user.password)
+ const res = await createUser({
+ url: servers[ 0 ].url,
+ accessToken: servers[ 0 ].accessToken,
+ username: user.username,
+ password: user.password
+ })
const userId = res.body.user.id
const userAccessToken = await userLogin(servers[0], user)
})
after(async function () {
- killallServers(servers)
-
- // Keep the logs if the test failed
- if (this['ok']) {
- await flushTests()
- }
+ await cleanupTests(servers)
})
})