runServer(j, function (app, url) {
anotherServerDone(j, app, url)
})
- }, 1000 * j)
+ }, 1000 * (j - 1))
}
})
}
const server = {
app: null,
url: `http://localhost:${9000 + number}`,
+ host: `localhost:${9000 + number}`,
client: {
id: null,
secret: null
// These actions are async so we need to be sure that they have both been done
const serverRunString = {
- 'Connected to mongodb': false,
'Server listening on port': false
}
+ const key = 'Database peertube_test' + number + ' is ready'
+ serverRunString[key] = false
const regexps = {
- client_id: 'Client id: ([a-f0-9]+)',
+ client_id: 'Client id: (.+)',
client_secret: 'Client secret: (.+)',
user_username: 'Username: (.+)',
user_password: 'User password: (.+)'
detached: true
}
- server.app = fork(pathUtils.join(__dirname, '../../../server.js'), [], options)
+ server.app = fork(pathUtils.join(__dirname, '..', '..', '..', 'dist', 'server.js'), [], options)
server.app.stdout.on('data', function onStdout (data) {
let dontContinue = false
if (serverRunString[key] === false) dontContinue = true
}
- // If no, there is maybe one thing not already initialized (mongodb...)
+ // If no, there is maybe one thing not already initialized (client/user credentials generation...)
if (dontContinue === true) return
server.app.stdout.removeListener('data', onStdout)