Run installDefaultNpmDeps whenever creating self-test apps.

Some tests disable the --prepare-app step, but still need babel-runtime to be installed.
phocks · Nov 2, 2016 · 6dcd8b7 · 6dcd8b7
1 parent 10f997a
commit 6dcd8b7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/tools/cli/commands-packages.js b/tools/cli/commands-packages.js
@@ -140,8 +140,6 @@ main.registerCommand({
     'allow-incompatible-update': { type: Boolean }
   }
 }, function (options) {
-  require("./commands.js").installDefaultNpmDeps(options.appDir);
-
   var projectContext = new projectContextModule.ProjectContext({
     projectDir: options.appDir,
     allowIncompatibleUpdate: options['allow-incompatible-update']

diff --git a/tools/tests/npm.js b/tools/tests/npm.js
@@ -20,7 +20,7 @@ selftest.define("npm", ["net"], function () {
     run = s.run("--once", "--raw-logs");
     run.tellMongo(MONGO_LISTENING);
     if (i === 0) {
-      run.waitSecs(2);
+      run.waitSecs(30);
       // use match instead of read because on a built release we can
       // also get an update message here.
       run.match(

diff --git a/tools/tool-testing/selftest.js b/tools/tool-testing/selftest.js
@@ -703,6 +703,8 @@ _.extend(Sandbox.prototype, {
       upgradersFile.appendUpgraders(upgraders.allUpgraders());
     }
 
+    require("../cli/commands.js").installDefaultNpmDeps(absoluteTo);
+
     if (options.dontPrepareApp) {
       return;
     }