Skip to content

Commit aaf7249

Browse files
committed
mv gl3d_cone-* out of npm run test-image into noci_test.sh
.. so that we test gl3d_cone-* mocks using orca, not our old nw.js imagetest container which doesn't generate cones properly for some reason.
1 parent 3f3bfac commit aaf7249

File tree

6 files changed

+8
-2
lines changed

6 files changed

+8
-2
lines changed

tasks/noci_test.sh

+3
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,11 @@ npm run test-jasmine -- --tags=noCI --nowatch || EXIT_STATE=$?
1313
# since the update to [email protected], we must use orca
1414
# as mapbox-gl versions >0.22.1 aren't supported on [email protected] used in the
1515
# 'old' image server
16+
#
17+
# cone traces don't render correctly in the imagetest container
1618
$root/../orca/bin/orca.js graph \
1719
$root/test/image/mocks/mapbox_* \
20+
$root/test/image/mocks/gl3d_cone* \
1821
--plotly $root/build/plotly.js \
1922
--mapbox-access-token "pk.eyJ1IjoiZXRwaW5hcmQiLCJhIjoiY2luMHIzdHE0MGFxNXVubTRxczZ2YmUxaCJ9.hwWZful0U2CQxit4ItNsiQ" \
2023
--output-dir $root/test/image/baselines/ \
44.3 KB
Loading
43.5 KB
Loading
66.7 KB
Loading

test/image/compare_pixels_test.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ else {
8686
* - font-wishlist
8787
* - all gl2d
8888
* - all mapbox
89+
* - gl3d_cone-*
8990
*
9091
* don't behave consistently from run-to-run and/or
9192
* machine-to-machine; skip over them for now.
@@ -95,7 +96,8 @@ function untestableFilter(mockName) {
9596
var cond = !(
9697
mockName === 'font-wishlist' ||
9798
mockName.indexOf('gl2d_') !== -1 ||
98-
mockName.indexOf('mapbox_') !== -1
99+
mockName.indexOf('mapbox_') !== -1 ||
100+
mockName.indexOf('gl3d_cone-') !== -1
99101
);
100102

101103
if(!cond) console.log(' -', mockName);

test/image/mocks/gl3d_cone-simple.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
},
3939
"scene2": {
4040
"domain": {"x": [0.5, 1]}
41-
}
41+
},
42+
"width": 800
4243
}
4344
}

0 commit comments

Comments
 (0)