aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/tests/real-world
diff options
context:
space:
mode:
authorChocobozzz <florian.bigard@gmail.com>2017-10-31 16:31:24 +0100
committerChocobozzz <florian.bigard@gmail.com>2017-10-31 16:31:24 +0100
commit53abc4c272be9ecc951274458d054dbaf86e594d (patch)
tree5d69eca59cf3b51c95ecad190f8cdb058ab9e3f7 /server/tests/real-world
parent604e02abcba0a50be23f243db30eca94b68cd35f (diff)
downloadPeerTube-53abc4c272be9ecc951274458d054dbaf86e594d.tar.gz
PeerTube-53abc4c272be9ecc951274458d054dbaf86e594d.tar.zst
PeerTube-53abc4c272be9ecc951274458d054dbaf86e594d.zip
Upgrade server packages
Diffstat (limited to 'server/tests/real-world')
-rw-r--r--server/tests/real-world/real-world.ts14
-rw-r--r--server/tests/real-world/tools/upload-directory.ts3
2 files changed, 9 insertions, 8 deletions
diff --git a/server/tests/real-world/real-world.ts b/server/tests/real-world/real-world.ts
index e225a1266..da5696f8c 100644
--- a/server/tests/real-world/real-world.ts
+++ b/server/tests/real-world/real-world.ts
@@ -80,11 +80,15 @@ start()
80async function start () { 80async function start () {
81 const servers = await runServers(numberOfPods) 81 const servers = await runServers(numberOfPods)
82 82
83 process.on('exit', async () => await exitServers(servers, flushAtExit)) 83 process.on('exit', async () => {
84 await exitServers(servers, flushAtExit)
85
86 return
87 })
84 process.on('SIGINT', goodbye) 88 process.on('SIGINT', goodbye)
85 process.on('SIGTERM', goodbye) 89 process.on('SIGTERM', goodbye)
86 90
87 console.log('Servers runned') 91 console.log('Servers ran')
88 initializeRequestsPerServer(servers) 92 initializeRequestsPerServer(servers)
89 93
90 let checking = false 94 let checking = false
@@ -150,10 +154,8 @@ function getRandomNumServer (servers) {
150} 154}
151 155
152async function runServers (numberOfPods: number) { 156async function runServers (numberOfPods: number) {
153 let servers = null 157 const servers: ServerInfo[] = (await flushAndRunMultipleServers(numberOfPods))
154 158 .map(s => Object.assign({ requestsNumber: 0 }, s))
155 // Run servers
156 servers = await flushAndRunMultipleServers(numberOfPods)
157 159
158 // Get the access tokens 160 // Get the access tokens
159 await setAccessTokensToServers(servers) 161 await setAccessTokensToServers(servers)
diff --git a/server/tests/real-world/tools/upload-directory.ts b/server/tests/real-world/tools/upload-directory.ts
index a8ab1669d..fdd56857a 100644
--- a/server/tests/real-world/tools/upload-directory.ts
+++ b/server/tests/real-world/tools/upload-directory.ts
@@ -1,7 +1,6 @@
1import * as program from 'commander' 1import * as program from 'commander'
2import * as Promise from 'bluebird' 2import * as Promise from 'bluebird'
3import { isAbsolute } from 'path' 3import { isAbsolute, join } from 'path'
4import { join } from 'path'
5 4
6import { readdirPromise } from '../../../helpers/core-utils' 5import { readdirPromise } from '../../../helpers/core-utils'
7import { execCLI } from '../../utils' 6import { execCLI } from '../../utils'