diff options
Diffstat (limited to 'server/tests/api/check-params/users.ts')
-rw-r--r-- | server/tests/api/check-params/users.ts | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/server/tests/api/check-params/users.ts b/server/tests/api/check-params/users.ts index b62806554..00d0a7e2b 100644 --- a/server/tests/api/check-params/users.ts +++ b/server/tests/api/check-params/users.ts | |||
@@ -7,7 +7,7 @@ import { UserRole, VideoImport, VideoImportState } from '../../../../shared' | |||
7 | 7 | ||
8 | import { | 8 | import { |
9 | createUser, flushTests, getMyUserInformation, getMyUserVideoRating, getUsersList, immutableAssign, killallServers, makeGetRequest, | 9 | createUser, flushTests, getMyUserInformation, getMyUserVideoRating, getUsersList, immutableAssign, killallServers, makeGetRequest, |
10 | makePostBodyRequest, makeUploadRequest, makePutBodyRequest, registerUser, removeUser, runServer, ServerInfo, setAccessTokensToServers, | 10 | makePostBodyRequest, makeUploadRequest, makePutBodyRequest, registerUser, removeUser, flushAndRunServer, ServerInfo, setAccessTokensToServers, |
11 | updateUser, uploadVideo, userLogin, deleteMe, unblockUser, blockUser | 11 | updateUser, uploadVideo, userLogin, deleteMe, unblockUser, blockUser |
12 | } from '../../../../shared/extra-utils' | 12 | } from '../../../../shared/extra-utils' |
13 | import { | 13 | import { |
@@ -40,10 +40,8 @@ describe('Test users API validators', function () { | |||
40 | before(async function () { | 40 | before(async function () { |
41 | this.timeout(30000) | 41 | this.timeout(30000) |
42 | 42 | ||
43 | await flushTests() | 43 | server = await flushAndRunServer(1) |
44 | 44 | serverWithRegistrationDisabled = await flushAndRunServer(2) | |
45 | server = await runServer(1) | ||
46 | serverWithRegistrationDisabled = await runServer(2) | ||
47 | 45 | ||
48 | await setAccessTokensToServers([ server ]) | 46 | await setAccessTokensToServers([ server ]) |
49 | 47 | ||
@@ -881,12 +879,7 @@ describe('Test users API validators', function () { | |||
881 | }) | 879 | }) |
882 | }) | 880 | }) |
883 | 881 | ||
884 | after(async function () { | 882 | after(function () { |
885 | killallServers([ server, serverWithRegistrationDisabled ]) | 883 | killallServers([ server, serverWithRegistrationDisabled ]) |
886 | |||
887 | // Keep the logs if the test failed | ||
888 | if (this['ok']) { | ||
889 | await flushTests() | ||
890 | } | ||
891 | }) | 884 | }) |
892 | }) | 885 | }) |