aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/tests
diff options
context:
space:
mode:
authorGérald Niel <gerald.niel@gegeweb.org>2018-04-19 07:54:51 +0200
committerGérald Niel <gerald.niel@gegeweb.org>2018-04-19 07:54:51 +0200
commit0030284b0df2983914291d6fe83675e2aa892e6a (patch)
tree2379f6f0c8a5e6ec1cb86d4bc808c7c48a4c4422 /server/tests
parentea5cd0fa2cdc7655ed5ecf134dedd52400837ef2 (diff)
parentf55e5a7bf81c2c27db1514273e3366511aabf4ae (diff)
downloadPeerTube-0030284b0df2983914291d6fe83675e2aa892e6a.tar.gz
PeerTube-0030284b0df2983914291d6fe83675e2aa892e6a.tar.zst
PeerTube-0030284b0df2983914291d6fe83675e2aa892e6a.zip
Merge branch 'develop' of framagit.org:chocobozzz/PeerTube into develop
Diffstat (limited to 'server/tests')
-rw-r--r--server/tests/utils/server/servers.ts2
1 files changed, 1 insertions, 1 deletions
diff --git a/server/tests/utils/server/servers.ts b/server/tests/utils/server/servers.ts
index 8373c73ab..1372c03c3 100644
--- a/server/tests/utils/server/servers.ts
+++ b/server/tests/utils/server/servers.ts
@@ -88,7 +88,7 @@ function runServer (serverNumber: number, configOverride?: Object) {
88 88
89 // These actions are async so we need to be sure that they have both been done 89 // These actions are async so we need to be sure that they have both been done
90 const serverRunString = { 90 const serverRunString = {
91 'Server listening on port': false 91 'Server listening': false
92 } 92 }
93 const key = 'Database peertube_test' + serverNumber + ' is ready' 93 const key = 'Database peertube_test' + serverNumber + ' is ready'
94 serverRunString[key] = false 94 serverRunString[key] = false