diff --git a/.travis.yml b/.travis.yml index 80285a634c..c0c90cedc5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,4 +29,3 @@ before_install: - sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu bionic main universe" - sudo apt-get update - sudo apt-get install -y libnss3 - - ls /usr/lib/x86_64-linux-gnu/libnss3.so diff --git a/tools/runners/run-mongo.js b/tools/runners/run-mongo.js index 530778a358..fc3f634dff 100644 --- a/tools/runners/run-mongo.js +++ b/tools/runners/run-mongo.js @@ -440,8 +440,8 @@ var launchMongo = async function(options) { return; } stopped = true; - _.each(subHandles, function(handle) { - handle.stop(); + _.each(subHandles, function(h) { + h.stop(); }); if (options.onStopped) { @@ -450,6 +450,7 @@ var launchMongo = async function(options) { reject(new StoppedDuringLaunch()); }; + resolve(); }); var yieldingMethod = async function(object, methodName, ...args) { @@ -782,8 +783,8 @@ var launchMongo = async function(options) { if (stopped) { return; } - var dbPath = files.pathJoin(options.projectLocalDir, 'dbs', '' + i); - await launchOneMongoAndWaitForReadyForInitiate(dbPath, options.port + i); + const newDbPath = files.pathJoin(options.projectLocalDir, 'dbs', '' + i); + await launchOneMongoAndWaitForReadyForInitiate(newDbPath, options.port + i); i--; } @@ -791,9 +792,9 @@ var launchMongo = async function(options) { await initiateReplSetAndWaitForReady(); } } else { - var dbPath = files.pathJoin(options.projectLocalDir, 'db'); - var portFile = !noOplog && files.pathJoin(dbPath, 'METEOR-PORT'); - await launchOneMongoAndWaitForReadyForInitiate(dbPath, options.port, portFile); + const newDbPath = files.pathJoin(options.projectLocalDir, 'db'); + var portFile = !noOplog && files.pathJoin(newDbPath, 'METEOR-PORT'); + await launchOneMongoAndWaitForReadyForInitiate(newDbPath, options.port, portFile); if (!stopped && !noOplog) { await initiateReplSetAndWaitForReady(); if (!stopped) {