test: add back pointcloud mock on CI runs

etpinard · etpinard · commit 64b14b20ab70 · 2016-10-19T10:46:42.000-04:00
- to make it work, make sure pointcoud mocks are tested first.
diff --git a/test/image/compare_pixels_test.js b/test/image/compare_pixels_test.js
@@ -73,7 +73,9 @@ if(pattern === 'gl2d_*') {
 
     if(isCI) {
         console.log('Filtering out multiple-subplot gl2d mocks:');
-        mockList = mockList.filter(untestableGL2DonCIfilter);
+        mockList = mockList
+            .filter(untestableGL2DonCIfilter)
+            .sort(sortForGL2DonCI);
         console.log('\n');
     }
 }
@@ -121,17 +123,32 @@ function untestableGL2DonCIfilter(mockName) {
         'gl2d_multiple_subplots',
         'gl2d_simple_inset',
         'gl2d_stacked_coupled_subplots',
-        'gl2d_stacked_subplots',
-
-        // not sure why this one still fails on CircleCI
-        'gl2d_pointcloud-basic'
+        'gl2d_stacked_subplots'
     ].indexOf(mockName) === -1;
 
     if(!cond) console.log(' -', mockName);
 
     return cond;
 }
 
+/* gl2d pointcloud mock(s) must be tested first
+ * on CircleCI in order to work; sort them here.
+ *
+ * Pointcloud relies on gl-shader@4.2.1 whereas
+ * other gl2d modules rely on gl-shader@4.2.0,
+ * we suspect that lone gl context on CircleCI is
+ * having issues with dealing with the two different
+ * gl-shader versions.
+ *
+ * More info here:
+ * https://github.com/plotly/plotly.js/pull/1037
+ */
+function sortForGL2DonCI(a, b) {
+    var root = 'gl2d_pointcloud';
+
+    return a.indexOf(root) < b.indexOf(root);
+}
+
 function runInBatch(mockList) {
     var running = 0;
 
