Apply Etienne recommendations

reset shard limit to 20 and retry to 5
revised timout as well as before and after functions in describe blocks in gl2d_plot_interact_test
lower the shard limit for the non-gl test-jasmine commands

Author: archmoj

.circleci/test.sh

@@ -6,13 +6,13 @@ set +o pipefail
 
 ROOT=$(dirname $0)/..
 EXIT_STATE=0
+MAX_AUTO_RETRY=5
 
 log () {
     echo -e "\n$1"
 }
 
 # inspired by https://unix.stackexchange.com/a/82602
-MAX_AUTO_RETRY=1
 retry () {
     local n=1
 
@@ -54,7 +54,6 @@ case $1 in
         set_tz
 
         SHARDS=($(node $ROOT/tasks/shard_jasmine_tests.js --tag=gl | circleci tests split))
-        MAX_AUTO_RETRY=2
         for s in ${SHARDS[@]}; do
             retry npm run test-jasmine -- "$s" --tags=gl --skip-tags=noCI --showSkipped
         done
@@ -65,8 +64,8 @@ case $1 in
     jasmine3)
         set_tz
 
-        SHARDS=($(node $ROOT/tasks/shard_jasmine_tests.js --tag=flaky | circleci tests split))
-        MAX_AUTO_RETRY=4
+        SHARDS=($(node $ROOT/tasks/shard_jasmine_tests.js --limit=1 --tag=flaky | circleci tests split))
+
         for s in ${SHARDS[@]}; do
             retry npm run test-jasmine -- "$s" --tags=flaky --skip-tags=noCI --showSkipped
         done

tasks/shard_jasmine_tests.js

@@ -15,7 +15,7 @@ var argv = minimist(process.argv.slice(2), {
         limit: ['l'],
     },
     default: {
-        limit: 1
+        limit: 20
     }
 });
 

test/jasmine/tests/gl2d_plot_interact_test.js

@@ -20,12 +20,11 @@ function countCanvases() {
     return d3.selectAll('canvas').size();
 }
 
-jasmine.DEFAULT_TIMEOUT_INTERVAL = 5000;
-
 describe('Test removal of gl contexts', function() {
     var gd;
 
     beforeEach(function() {
+        jasmine.DEFAULT_TIMEOUT_INTERVAL = 5000;
         gd = createGraphDiv();
     });
 
@@ -98,6 +97,7 @@ describe('Test gl plot side effects', function() {
     var gd;
 
     beforeEach(function() {
+        jasmine.DEFAULT_TIMEOUT_INTERVAL = 5000;
         gd = createGraphDiv();
     });
 
@@ -320,6 +320,7 @@ describe('Test gl2d plots', function() {
     var mock = require('@mocks/gl2d_10.json');
 
     beforeEach(function() {
+        jasmine.DEFAULT_TIMEOUT_INTERVAL = 5000;
         gd = createGraphDiv();
     });
 
@@ -1274,9 +1275,19 @@ describe('Test gl2d plots', function() {
 });
 
 describe('Test scattergl autorange:', function() {
-    afterEach(destroyGraphDiv);
-
     describe('should return the same value as SVG scatter for ~small~ data', function() {
+        var gd;
+
+        beforeEach(function() {
+            jasmine.DEFAULT_TIMEOUT_INTERVAL = 5000;
+            gd = createGraphDiv();
+        });
+
+        afterEach(function() {
+            Plotly.purge(gd);
+            destroyGraphDiv();
+        });
+
         var specs = [
             {name: 'lines+markers', fig: require('@mocks/gl2d_10.json')},
             {name: 'bubbles', fig: require('@mocks/gl2d_12.json')},
@@ -1287,7 +1298,6 @@ describe('Test scattergl autorange:', function() {
 
         specs.forEach(function(s) {
             it('@gl - case ' + s.name, function(done) {
-                var gd = createGraphDiv();
                 var glRangeX;
                 var glRangeY;
 
@@ -1320,6 +1330,7 @@ describe('Test scattergl autorange:', function() {
         var gd;
 
         beforeEach(function() {
+            jasmine.DEFAULT_TIMEOUT_INTERVAL = 5000;
             gd = createGraphDiv();
             // to avoid expansive draw calls (which could be problematic on CI)
             spyOn(ScatterGl, 'plot').and.callFake(function(gd) {
@@ -1328,6 +1339,11 @@ describe('Test scattergl autorange:', function() {
             });
         });
 
+        afterEach(function() {
+            Plotly.purge(gd);
+            destroyGraphDiv();
+        });
+
         // threshold for 'fast' axis expansion routine
         var N = 1e5;
         var x = new Array(N);