use port 0 + run test in //

This commit is contained in:
Romain Beaumont 2018-05-25 00:50:33 +02:00
parent 0dabd933e2
commit 754ec4bced
No known key found for this signature in database
GPG key ID: DB60E388B3BCF286
3 changed files with 6 additions and 7 deletions

View file

@ -16,7 +16,7 @@
"scripts": { "scripts": {
"prepare": "require-self", "prepare": "require-self",
"lint": "standard test/*.test.js src/**/*.js src/**/**/*.js src/*.js examples/*.js *.js", "lint": "standard test/*.test.js src/**/*.js src/**/**/*.js src/*.js examples/*.js *.js",
"test": "jest --verbose --runInBand" "test": "jest --verbose"
}, },
"keywords": [], "keywords": [],
"license": "MIT", "license": "MIT",

View file

@ -72,10 +72,9 @@ squid.supportedVersions.forEach((supportedVersion, i) => {
} }
beforeEach(async () => { beforeEach(async () => {
const PORT = Math.round(30000 + Math.random() * 20000)
const options = settings const options = settings
options['online-mode'] = false options['online-mode'] = false
options['port'] = PORT options['port'] = 0
options['view-distance'] = 2 options['view-distance'] = 2
options['worldFolder'] = undefined options['worldFolder'] = undefined
options['logging'] = false options['logging'] = false
@ -84,15 +83,16 @@ squid.supportedVersions.forEach((supportedVersion, i) => {
serv = squid.createMCServer(options) serv = squid.createMCServer(options)
await once(serv, 'listening') await once(serv, 'listening')
const port = serv._server.socketServer.address().port
bot = mineflayer.createBot({ bot = mineflayer.createBot({
host: 'localhost', host: 'localhost',
port: PORT, port: port,
username: 'bot', username: 'bot',
version: version.minecraftVersion version: version.minecraftVersion
}) })
bot2 = mineflayer.createBot({ bot2 = mineflayer.createBot({
host: 'localhost', host: 'localhost',
port: PORT, port: port,
username: 'bot2', username: 'bot2',
version: version.minecraftVersion version: version.minecraftVersion
}) })

View file

@ -11,7 +11,6 @@ squid.supportedVersions.forEach((supportedVersion, i) => {
if (!(i >= firstVersion && i <= lastVersion)) { if (!(i >= firstVersion && i <= lastVersion)) {
return return
} }
const PORT = Math.round(30000 + Math.random() * 20000)
const mcData = require('minecraft-data')(supportedVersion) const mcData = require('minecraft-data')(supportedVersion)
const version = mcData.version const version = mcData.version
@ -22,7 +21,7 @@ squid.supportedVersions.forEach((supportedVersion, i) => {
beforeAll(done => { beforeAll(done => {
const options = settings const options = settings
options['online-mode'] = false options['online-mode'] = false
options['port'] = PORT options['port'] = 0
options['view-distance'] = 2 options['view-distance'] = 2
options['worldFolder'] = undefined options['worldFolder'] = undefined
options['logging'] = false options['logging'] = false