Bug 1139586 - Attempt to fix intermittent failures in Loop's Marionette unit tests by extending the timeout. r=mikedeboer, a=test-only
authorMark Banner <standard8@mozilla.com>
Mon, 30 Mar 2015 14:08:53 +0100
changeset 258225 d30e64ad7e1f
parent 258224 231768361c8b
child 258226 fdb4e8b3eedb
push id4623
push userryanvm@gmail.com
push date2015-04-03 01:49 +0000
treeherdermozilla-beta@9c755cdc241c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmikedeboer, test-only
bugs1139586
milestone38.0
Bug 1139586 - Attempt to fix intermittent failures in Loop's Marionette unit tests by extending the timeout. r=mikedeboer, a=test-only
browser/components/loop/test/desktop-local/index.html
browser/components/loop/test/shared/index.html
browser/components/loop/test/standalone/index.html
--- a/browser/components/loop/test/desktop-local/index.html
+++ b/browser/components/loop/test/desktop-local/index.html
@@ -30,17 +30,17 @@
 
   <!-- test dependencies -->
   <script src="../shared/vendor/mocha-2.0.1.js"></script>
   <script src="../shared/vendor/chai-1.9.0.js"></script>
   <script src="../shared/vendor/sinon-1.12.2.js"></script>
   <script>
     /*global chai,mocha */
     chai.Assertion.includeStack = true;
-    mocha.setup('bdd');
+    mocha.setup({ui: 'bdd', timeout: 10000});
   </script>
 
   <!-- App scripts -->
   <script src="../../content/shared/js/utils.js"></script>
   <script src="../../content/shared/js/feedbackApiClient.js"></script>
   <script src="../../content/shared/js/models.js"></script>
   <script src="../../content/shared/js/mixins.js"></script>
   <script src="../../content/shared/js/websocket.js"></script>
--- a/browser/components/loop/test/shared/index.html
+++ b/browser/components/loop/test/shared/index.html
@@ -30,17 +30,17 @@
 
   <!-- test dependencies -->
   <script src="vendor/mocha-2.0.1.js"></script>
   <script src="vendor/chai-1.9.0.js"></script>
   <script src="vendor/sinon-1.12.2.js"></script>
   <script>
     /*global chai, mocha */
     chai.Assertion.includeStack = true;
-    mocha.setup('bdd');
+    mocha.setup({ui: 'bdd', timeout: 10000});
   </script>
 
   <!-- App scripts -->
   <script src="../../content/shared/js/utils.js"></script>
   <script src="../../content/shared/js/models.js"></script>
   <script src="../../content/shared/js/mixins.js"></script>
   <script src="../../content/shared/js/websocket.js"></script>
   <script src="../../content/shared/js/feedbackApiClient.js"></script>
--- a/browser/components/loop/test/standalone/index.html
+++ b/browser/components/loop/test/standalone/index.html
@@ -30,17 +30,17 @@
   <script src="../../standalone/content/libs/l10n-gaia-02ca67948fe8.js"></script>
   <!-- test dependencies -->
   <script src="../shared/vendor/mocha-2.0.1.js"></script>
   <script src="../shared/vendor/chai-1.9.0.js"></script>
   <script src="../shared/vendor/sinon-1.12.2.js"></script>
   <script src="../shared/sdk_mock.js"></script>
   <script>
     chai.Assertion.includeStack = true;
-    mocha.setup('bdd');
+    mocha.setup({ui: 'bdd', timeout: 10000});
   </script>
   <!-- App scripts -->
   <script src="../../content/shared/js/utils.js"></script>
   <script src="../../content/shared/js/models.js"></script>
   <script src="../../content/shared/js/mixins.js"></script>
   <script src="../../content/shared/js/websocket.js"></script>
   <script src="../../content/shared/js/feedbackApiClient.js"></script>
   <script src="../../content/shared/js/actions.js"></script>