X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fcheck-params%2Fdebug.ts;h=8dad267233f01fbc26c10d8df208ec5a2205f94d;hb=8c559fad1e1c4c2ab7f1388c73200aa4c6256d74;hp=9bf6646572297486e484c92ae78c6641113a5b02;hpb=5d79474cc66383ecbfcef6366f63a34c3af21cbf;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/tests/api/check-params/debug.ts b/server/tests/api/check-params/debug.ts index 9bf664657..8dad26723 100644 --- a/server/tests/api/check-params/debug.ts +++ b/server/tests/api/check-params/debug.ts @@ -6,12 +6,12 @@ import { createUser, flushTests, killallServers, - runServer, + flushAndRunServer, ServerInfo, setAccessTokensToServers, - userLogin -} from '../../../../shared/utils' -import { makeGetRequest } from '../../../../shared/utils/requests/requests' + userLogin, cleanupTests +} from '../../../../shared/extra-utils' +import { makeGetRequest } from '../../../../shared/extra-utils/requests/requests' describe('Test debug API validators', function () { const path = '/api/v1/server/debug' @@ -23,9 +23,7 @@ describe('Test debug API validators', function () { before(async function () { this.timeout(120000) - await flushTests() - - server = await runServer(1) + server = await flushAndRunServer(1) await setAccessTokensToServers([ server ]) @@ -33,7 +31,7 @@ describe('Test debug API validators', function () { username: 'user1', password: 'my super password' } - await createUser(server.url, server.accessToken, user.username, user.password) + await createUser({ url: server.url, accessToken: server.accessToken, username: user.username, password: user.password }) userAccessToken = await userLogin(server, user) }) @@ -68,11 +66,6 @@ describe('Test debug API validators', function () { }) after(async function () { - killallServers([ server ]) - - // Keep the logs if the test failed - if (this['ok']) { - await flushTests() - } + await cleanupTests([ server ]) }) })