circleci: 🔪 special handling of gl2d mocks

antoinerg · antoinerg · commit 609cdf89bf2e · 2019-03-25T20:31:09.000-04:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -77,7 +77,7 @@ jobs:
   test-image:
     docker:
       - image: plotly/testbed:latest
-    parallelism: 2
+    parallelism: 4
     working_directory: /var/www/streambed/image_server/plotly.js/
     steps:
       - attach_workspace:
diff --git a/.circleci/test.sh b/.circleci/test.sh
@@ -82,7 +82,6 @@ case $1 in
 
     image2)
         npm run test-export     || EXIT_STATE=$?
-        npm run test-image-gl2d || EXIT_STATE=$?
         exit $EXIT_STATE
         ;;
 
diff --git a/package.json b/package.json
@@ -35,7 +35,6 @@
     "pretest": "node tasks/pretest.js",
     "test-jasmine": "karma start test/jasmine/karma.conf.js",
     "test-image": "node tasks/test_image.js",
-    "test-image-gl2d": "node tasks/test_image.js gl2d_* --queue",
     "test-export": "node tasks/test_export.js",
     "test-syntax": "node tasks/test_syntax.js && npm run find-strings -- --no-output",
     "test-bundle": "node tasks/test_bundle.js",
diff --git a/test/image/compare_pixels_test.js b/test/image/compare_pixels_test.js
@@ -69,16 +69,6 @@ argv._.forEach(function(pattern) {
         throw new Error('No mocks found with pattern ' + pattern);
     }
 
-    // gl2d have limited image-test support
-    if(pattern === 'gl2d_*') {
-        if(!isInQueue) {
-            console.log('WARN: Running gl2d image tests in batch may lead to unwanted results\n');
-        }
-        console.log('\nSorting gl2d mocks to avoid gl-shader conflicts');
-        sortGl2dMockList(mockList);
-        console.log('');
-    }
-
     allMockList = allMockList.concat(mockList);
 });
 
@@ -120,7 +110,7 @@ else {
 function untestableFilter(mockName) {
     var cond = !(
         mockName === 'font-wishlist' ||
-        mockName.indexOf('gl2d_') !== -1 ||
+        // mockName.indexOf('gl2d_') !== -1 ||
         mockName.indexOf('mapbox_') !== -1
     );
 
@@ -129,34 +119,6 @@ function untestableFilter(mockName) {
     return cond;
 }
 
-/* gl2d pointcloud and other non-regl gl2d mock(s)
- * must be tested first on in order to work;
- * sort them here.
- *
- * gl-shader appears to conflict with regl.
- * We suspect that the lone gl context on CircleCI is
- * having issues with dealing with the two different
- * program binding algorithm.
- *
- * The problem will be solved by switching all our
- * WebGL-based trace types to regl.
- *
- * More info here:
- * https://github.com/plotly/plotly.js/pull/1037
- */
-function sortGl2dMockList(mockList) {
-    var mockNames = ['gl2d_pointcloud-basic', 'gl2d_heatmapgl'];
-    var pos = 0;
-
-    mockNames.forEach(function(m) {
-        var ind = mockList.indexOf(m);
-        var tmp = mockList[pos];
-        mockList[pos] = m;
-        mockList[ind] = tmp;
-        pos++;
-    });
-}
-
 function runInBatch(mockList) {
     var running = 0;
 
