Merge remote-tracking branch 'origin/master' into increase_coverage_c…

…horopleth
OpenGeoscience · Mar 15, 2017 · 90b97b7 · 90b97b7
2 parents 3372d19 + a210c07
commit 90b97b7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,7 @@ sudo: required
 dist: trusty
 
 node_js:
-  - '0.12'
+  - 4
 
 addons:
   firefox: latest

diff --git a/tests/gl-cases/glLinesSpeed.js b/tests/gl-cases/glLinesSpeed.js
@@ -41,7 +41,7 @@ describe('glLinesSpeed', function () {
       console.log('Load time ' + totaltime + ' ms (average across ' +
                   times.length + ' loads)');
       console.log(times);
-      expect(totaltime).toBeLessThan(1000);
+      expect(totaltime).toBeLessThan(2000);
       /* Test animation time. */
       starttime = new Date().getTime();
       animationFrame();
@@ -75,7 +75,7 @@ describe('glLinesSpeed', function () {
       fps = 1000.0 / frametime;
       console.log('Usable framerate ' + fps);
       console.log(animTimes);
-      expect(fps).toBeGreaterThan(1.5);
+      expect(fps).toBeGreaterThan(1.0);
       $('#map').append($('<div style="display: none" id="framerateResults">')
         .attr('results', fps));
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ sudo: required @@
     dist: trusty
     node_js:
-      - '0.12'
+      - 4
     addons:
       firefox: latest
@@ Expand Down @@