Merge pull request #2800 from PieterGit/travis_improve

decrease timeouts to detect regressions faster in future
nightscout · Oct 25, 2017 · c6af0aa · c6af0aa
2 parents ca7972a + 68536d9
commit c6af0aa
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 23 deletions.
diff --git a/Makefile b/Makefile
@@ -30,7 +30,7 @@ all: test
 
 coverage:
 	NODE_ENV=test ${MONGO_SETTINGS} \
-	${ISTANBUL} cover ${MOCHA} -- --timeout 30000 -R tap ${TESTS}
+	${ISTANBUL} cover ${MOCHA} -- --timeout 15000 -R tap ${TESTS}
 
 report:
 	test -f ${ANALYZED} && \
@@ -45,7 +45,7 @@ test:
 
 travis:
 	NODE_ENV=test ${MONGO_SETTINGS} \
-	${ISTANBUL} cover ${MOCHA} --report lcovonly -- --timeout 50000 -R tap ${TESTS}
+	${ISTANBUL} cover ${MOCHA} --report lcovonly -- --timeout 5000 -R tap ${TESTS}
 
 docker_release:
 	# Get the version from the package.json file

diff --git a/package-lock.json b/package-lock.json
diff --git a/tests/admintools.test.js b/tests/admintools.test.js
@@ -57,7 +57,7 @@ var someData = {
 
 describe('admintools', function ( ) {
   var self = this;
-  this.timeout(30000);
+  this.timeout(30000); // TODO: see why this test takes longer on Travis to complete
   before(function (done) {
     benv.setup(function() {
 

diff --git a/tests/careportal.test.js b/tests/careportal.test.js
@@ -13,6 +13,8 @@ var nowData = {
 };
 
 describe('client', function ( ) {
+  this.timeout(30000); // TODO: see why this test takes longer on Travis to complete
+
   var self = this;
 
   var headless = require('./fixtures/headless')(benv, this);

diff --git a/tests/hashauth.test.js b/tests/hashauth.test.js
@@ -6,6 +6,8 @@ var read = require('fs').readFileSync;
 var serverSettings = require('./fixtures/default-server-settings');
 
 describe('hashauth', function ( ) {
+  this.timeout(40000); // TODO: see why this test takes longer on Travis to complete
+
   var self = this;
   var headless = require('./fixtures/headless')(benv, this);
 
@@ -63,7 +65,6 @@ describe('hashauth', function ( ) {
   */
 
   it ('should make module unauthorized', function () {
-     this.timeout(50000);
     var client = require('../lib/client');
     var hashauth = require('../lib/hashauth');
 
@@ -82,7 +83,6 @@ describe('hashauth', function ( ) {
   });
 
   it ('should make module authorized', function () {
-    this.timeout(50000);
     var client = require('../lib/client');
     var hashauth = require('../lib/hashauth');
 
@@ -99,9 +99,6 @@ describe('hashauth', function ( ) {
   });
 
   it ('should store hash and the remove authentication', function () {
-
-    this.timeout(50000);
-
     var client = require('../lib/client');
     var hashauth = require('../lib/hashauth');
     var localStorage = require('./fixtures/localstorage');   

diff --git a/tests/pluginbase.test.js b/tests/pluginbase.test.js
@@ -4,6 +4,8 @@ require('should');
 var benv = require('benv');
 
 describe('pluginbase', function ( ) {
+  this.timeout(40000); // TODO: see why this test takes longer on Travis to complete
+
   var headless = require('./fixtures/headless')(benv, this);
 
   before(function (done) {

diff --git a/tests/profileeditor.test.js b/tests/profileeditor.test.js
@@ -71,7 +71,7 @@ var someData = {
 
 
 describe('Profile editor', function ( ) {
-  this.timeout(30000);
+  this.timeout(40000); //TODO: see why this test takes longer on Travis to complete
   var headless = require('./fixtures/headless')(benv, this);
 
   before(function (done) {