aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/tests/api
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2019-01-08 15:51:52 +0100
committerChocobozzz <chocobozzz@cpy.re>2019-01-09 11:15:15 +0100
commit89ada4e26ca1df8ff0dd02acda1d1661f121a294 (patch)
treeb8c8d373d8140227c3b73bbf14d5e1b15d877ee2 /server/tests/api
parent43483d12963ed7a82adee2e35a7bcb7e55e54b3e (diff)
downloadPeerTube-89ada4e26ca1df8ff0dd02acda1d1661f121a294.tar.gz
PeerTube-89ada4e26ca1df8ff0dd02acda1d1661f121a294.tar.zst
PeerTube-89ada4e26ca1df8ff0dd02acda1d1661f121a294.zip
Fix socket.io websocket connection
Diffstat (limited to 'server/tests/api')
-rw-r--r--server/tests/api/activitypub/refresher.ts2
-rw-r--r--server/tests/api/server/email.ts1
-rw-r--r--server/tests/api/users/index.ts4
-rw-r--r--server/tests/api/users/user-notifications.ts4
-rw-r--r--server/tests/api/users/users-verification.ts3
5 files changed, 9 insertions, 5 deletions
diff --git a/server/tests/api/activitypub/refresher.ts b/server/tests/api/activitypub/refresher.ts
index 332ea7ed1..62ad8a0b5 100644
--- a/server/tests/api/activitypub/refresher.ts
+++ b/server/tests/api/activitypub/refresher.ts
@@ -22,7 +22,7 @@ describe('Test AP refresher', function () {
22 let videoUUID3: string 22 let videoUUID3: string
23 23
24 before(async function () { 24 before(async function () {
25 this.timeout(30000) 25 this.timeout(60000)
26 26
27 servers = await flushAndRunMultipleServers(2) 27 servers = await flushAndRunMultipleServers(2)
28 28
diff --git a/server/tests/api/server/email.ts b/server/tests/api/server/email.ts
index b8d29ef81..f96c57b66 100644
--- a/server/tests/api/server/email.ts
+++ b/server/tests/api/server/email.ts
@@ -251,6 +251,7 @@ describe('Test emails', function () {
251 }) 251 })
252 252
253 after(async function () { 253 after(async function () {
254 MockSmtpServer.Instance.kill()
254 killallServers([ server ]) 255 killallServers([ server ])
255 }) 256 })
256}) 257})
diff --git a/server/tests/api/users/index.ts b/server/tests/api/users/index.ts
index 63e6e827a..52ba6984e 100644
--- a/server/tests/api/users/index.ts
+++ b/server/tests/api/users/index.ts
@@ -1,6 +1,6 @@
1import './users-verification'
2import './user-notifications'
1import './blocklist' 3import './blocklist'
2import './user-subscriptions' 4import './user-subscriptions'
3import './user-notifications'
4import './users' 5import './users'
5import './users-multiple-servers' 6import './users-multiple-servers'
6import './users-verification'
diff --git a/server/tests/api/users/user-notifications.ts b/server/tests/api/users/user-notifications.ts
index ad68d8e69..5260d64cc 100644
--- a/server/tests/api/users/user-notifications.ts
+++ b/server/tests/api/users/user-notifications.ts
@@ -175,7 +175,7 @@ describe('Test users notifications', function () {
175 }) 175 })
176 176
177 it('Should send a new video notification if the user follows the local video publisher', async function () { 177 it('Should send a new video notification if the user follows the local video publisher', async function () {
178 this.timeout(10000) 178 this.timeout(15000)
179 179
180 await addUserSubscription(servers[0].url, userAccessToken, 'root_channel@localhost:9001') 180 await addUserSubscription(servers[0].url, userAccessToken, 'root_channel@localhost:9001')
181 await waitJobs(servers) 181 await waitJobs(servers)
@@ -1010,6 +1010,8 @@ describe('Test users notifications', function () {
1010 }) 1010 })
1011 1011
1012 after(async function () { 1012 after(async function () {
1013 MockSmtpServer.Instance.kill()
1014
1013 killallServers(servers) 1015 killallServers(servers)
1014 }) 1016 })
1015}) 1017})
diff --git a/server/tests/api/users/users-verification.ts b/server/tests/api/users/users-verification.ts
index afc8a0059..babeda2b8 100644
--- a/server/tests/api/users/users-verification.ts
+++ b/server/tests/api/users/users-verification.ts
@@ -4,7 +4,7 @@ import * as chai from 'chai'
4import 'mocha' 4import 'mocha'
5import { 5import {
6 registerUser, flushTests, getUserInformation, getMyUserInformation, killallServers, 6 registerUser, flushTests, getUserInformation, getMyUserInformation, killallServers,
7 userLogin, login, runServer, ServerInfo, verifyEmail, updateCustomSubConfig 7 userLogin, login, runServer, ServerInfo, verifyEmail, updateCustomSubConfig, wait
8} from '../../../../shared/utils' 8} from '../../../../shared/utils'
9import { setAccessTokensToServers } from '../../../../shared/utils/users/login' 9import { setAccessTokensToServers } from '../../../../shared/utils/users/login'
10import { MockSmtpServer } from '../../../../shared/utils/miscs/email' 10import { MockSmtpServer } from '../../../../shared/utils/miscs/email'
@@ -123,6 +123,7 @@ describe('Test users account verification', function () {
123 }) 123 })
124 124
125 after(async function () { 125 after(async function () {
126 MockSmtpServer.Instance.kill()
126 killallServers([ server ]) 127 killallServers([ server ])
127 128
128 // Keep the logs if the test failed 129 // Keep the logs if the test failed