X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Factivitypub%2Ffetch.ts;h=7240bb0fb494ebac59ddb0eabb8d413b2d927cab;hb=7243f84db0f34c6d5610a54603b0cce7c284a7b3;hp=e84eb18bb3e2e2e7e0a6cf3ab5f04d2dfb5db1b3;hpb=92e07c3b5d9dbf2febedb1b5b87ec676eb6d1ac8;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/tests/api/activitypub/fetch.ts b/server/tests/api/activitypub/fetch.ts
index e84eb18bb..7240bb0fb 100644
--- a/server/tests/api/activitypub/fetch.ts
+++ b/server/tests/api/activitypub/fetch.ts
@@ -3,6 +3,7 @@
 import 'mocha'
 
 import {
+  closeAllSequelize,
   createUser,
   doubleFollow,
   flushAndRunMultipleServers,
@@ -11,12 +12,13 @@ import {
   killallServers,
   ServerInfo,
   setAccessTokensToServers,
+  setActorField,
+  setVideoField,
   uploadVideo,
-  userLogin
-} from '../../../../shared/utils'
+  userLogin,
+  waitJobs
+} from '../../../../shared/extra-utils'
 import * as chai from 'chai'
-import { setActorField, setVideoField } from '../../utils/miscs/sql'
-import { waitJobs } from '../../../../shared/utils/server/jobs'
 import { Video } from '../../../../shared/models/videos'
 
 const expect = chai.expect
@@ -36,7 +38,7 @@ describe('Test ActivityPub fetcher', function () {
 
     const user = { username: 'user1', password: 'password' }
     for (const server of servers) {
-      await createUser(server.url, server.accessToken, user.username, user.password)
+      await createUser({ url: server.url, accessToken: server.accessToken, username: user.username, password: user.password })
     }
 
     const userAccessToken = await userLogin(servers[0], user)
@@ -78,9 +80,6 @@ describe('Test ActivityPub fetcher', function () {
   after(async function () {
     killallServers(servers)
 
-    // Keep the logs if the test failed
-    if (this['ok']) {
-      await flushTests()
-    }
+    await closeAllSequelize(servers)
   })
 })