reset timeouts now that cache hits

Author: Kelly Selden

test/acceptance/ember-cli-update-test.js

@@ -160,8 +160,6 @@ describe(function() {
   });
 
   it('runs codemods', async function() {
-    this.timeout(5 * 60 * 1000);
-
     async function _merge(src, dest) {
       await fs.copy(
         path.resolve(__dirname, `../fixtures/codemod/codemods/ember-modules-codemod/${src}/my-app`),
@@ -275,8 +273,6 @@ describe(function() {
   });
 
   it('can pick from multiple blueprints', async function() {
-    this.timeout(15 * 60 * 1000);
-
     let {
       location,
       version: to
@@ -397,8 +393,6 @@ describe(function() {
   });
 
   it('can reset the default blueprint', async function() {
-    this.timeout(5 * 60 * 1000);
-
     let {
       status
     } = await (await merge({
@@ -424,8 +418,6 @@ describe(function() {
   });
 
   it('can init the default blueprint', async function() {
-    this.timeout(5 * 60 * 1000);
-
     let {
       status
     } = await (await merge({
@@ -450,7 +442,7 @@ describe(function() {
   });
 
   it('can install an addon with a default blueprint and a state file', async function() {
-    this.timeout(3 * 60 * 1000);
+    this.timeout(60 * 1000);
 
     let {
       location
@@ -491,7 +483,7 @@ describe(function() {
   });
 
   it('can update a legacy addon blueprint', async function() {
-    this.timeout(15 * 60 * 1000);
+    this.timeout(3 * 60 * 1000);
 
     let {
       name,
@@ -534,7 +526,7 @@ describe(function() {
   // in existing npm addons
   // https://github.com/salsify/ember-cli-dependency-lint/blob/v1.0.3/lib/commands/dependency-lint.js#L5
   it('can update a npm addon blueprint', async function() {
-    this.timeout(15 * 60 * 1000);
+    this.timeout(3 * 60 * 1000);
 
     let {
       name,
@@ -640,8 +632,6 @@ describe(function() {
   });
 
   it('can update a legacy blueprint without a state file', async function() {
-    this.timeout(3 * 60 * 1000);
-
     let {
       location,
       version: from,

test/integration/index-test.js

@@ -314,8 +314,6 @@ applicable codemods: ember-modules-codemod, ember-qunit-codemod, ember-test-help
   });
 
   it('can create a personal diff instead of using an output repo - app', async function() {
-    this.timeout(5 * 60 * 1000);
-
     let {
       status
     } = await merge({
@@ -332,8 +330,6 @@ applicable codemods: ember-modules-codemod, ember-qunit-codemod, ember-test-help
   });
 
   it('can create a personal diff instead of using an output repo - addon', async function() {
-    this.timeout(5 * 60 * 1000);
-
     let {
       status
     } = await merge({
@@ -350,8 +346,6 @@ applicable codemods: ember-modules-codemod, ember-qunit-codemod, ember-test-help
   });
 
   describe('blueprints', function() {
-    this.timeout(10 * 60 * 1000);
-
     describe('--blueprint', function() {
       it('throws if missing --from', async function() {
         let promise = merge({

test/integration/init-test.js

@@ -18,7 +18,7 @@ const { initBlueprint } = require('../helpers/blueprint');
 const loadSafeBlueprintFile = require('../../src/load-safe-blueprint-file');
 
 describe(init, function() {
-  this.timeout(5 * 60 * 1000);
+  this.timeout(30 * 1000);
 
   let cwd;
   let tmpPath;

test/integration/install-test.js

@@ -18,7 +18,7 @@ const { initBlueprint } = require('../helpers/blueprint');
 const loadSafeBlueprintFile = require('../../src/load-safe-blueprint-file');
 
 describe(install, function() {
-  this.timeout(3 * 60 * 1000);
+  this.timeout(60 * 1000);
 
   let cwd;
   let tmpPath;

test/integration/overwrite-blueprint-files-test.js

@@ -13,7 +13,7 @@ const sinon = require('sinon');
 const { ember } = require('../../src/ember-install-addon');
 
 describe(overwriteBlueprintFiles, function() {
-  this.timeout(3 * 60 * 1000);
+  this.timeout(60 * 1000);
 
   it('can install an addon with a default blueprint and no state file', async function() {
     let tmpPath = await buildTmp({