Add second list for image comparisons

Author: camdecoster

.github/scripts/test.sh

@@ -108,7 +108,8 @@ case $1 in
         ;;
 
     make-baselines-mathjax3)
-        python test/image/make_baseline.py mathjax3    legend_mathjax_title_and_items mathjax parcats_grid_subplots table_latex_multitrace_scatter table_plain_birds table_wrapped_birds ternary-mathjax ternary-mathjax-title-place-subtitle || EXIT_STATE=$?
+        MATHJAX3_MOCKS=$(jq -r '.compare_mathjax3 | join(" ")' test/image/compare_pixels_collections.json)
+        python test/image/make_baseline.py mathjax3 $MATHJAX3_MOCKS || EXIT_STATE=$?
         exit $EXIT_STATE
         ;;
 

test/image/compare_pixels_collections.json

@@ -0,0 +1,21 @@
+{
+  "compare_disallow": [
+    "map_angles",
+    "map_fonts-supported-open-sans-weight",
+    "map_fonts-supported-open-sans",
+    "map_layers",
+    "map_predefined-styles2",
+    "map_scattercluster",
+    "map_stamen-style"
+  ],
+  "compare_mathjax3": [
+    "legend_mathjax_title_and_items",
+    "mathjax",
+    "parcats_grid_subplots",
+    "table_latex_multitrace_scatter",
+    "table_plain_birds",
+    "table_wrapped_birds",
+    "ternary-mathjax",
+    "ternary-mathjax-title-place-subtitle"
+  ]
+}

test/image/compare_pixels_test.mjs

@@ -63,9 +63,10 @@ argv._.forEach((pattern) => {
 
 const skipped = new Set();
 const failed = new Set();
-// TODO: In Node 20+, replace with: import disallowListData from './disallow_list.json' with { type: 'json' };
-const disallowListPath = path.join(__dirname, 'disallow_list.json');
-const disallowList = new Set(JSON.parse(fs.readFileSync(disallowListPath)));
+// TODO: In Node 20+, replace with: import collections from './compare_pixels_collections.json' with { type: 'json' };
+const collectionsPath = path.join(__dirname, 'compare_pixels_collections.json');
+const collections = JSON.parse(fs.readFileSync(collectionsPath));
+const disallowList = new Set(collections.compare_disallow);
 const flakyList = new Set(['gl3d_bunny-hull']);
 const flakyListMaps = new Set([
     // more flaky
@@ -89,16 +90,7 @@ if (virtualWebgl) {
 }
 
 if (mathjax3) {
-    allMockList = [
-        'legend_mathjax_title_and_items',
-        'mathjax',
-        'parcats_grid_subplots',
-        'table_latex_multitrace_scatter',
-        'table_plain_birds',
-        'table_wrapped_birds',
-        'ternary-mathjax',
-        'ternary-mathjax-title-place-subtitle'
-    ];
+    allMockList = collections.compare_mathjax3;
 }
 allMockList = new Set(allMockList);
 

test/image/disallow_list.json

@@ -68,9 +68,9 @@
 else:
     allNames = ALL_MOCKS
 
-with open(os.path.join(root, "test", "image", "disallow_list.json"), "r") as f:
+with open(os.path.join(root, "test", "image", "compare_pixels_collections.json"), "r") as f:
     # unable to generate baselines for the following mocks
-    disallowList = set(json.load(f))
+    disallowList = set(json.load(f)["compare_disallow"])
 allNames = [a for a in allNames if a not in disallowList]
 
 if len(allNames) == 0: