summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksandar Stojiljkovic <aleksandar.stojiljkovic@mapbox.com>2019-08-05 22:13:59 +0300
committerAleksandar Stojiljkovic <aleksandar.stojiljkovic@mapbox.com>2019-08-05 22:23:48 +0300
commitbcdb1cd6e44f7cdff7ef004044ff7cf312088e18 (patch)
treebf18491b64957b24f699ff5072711fc7cb1da045
parent8103a2b028358b747fe0f2d6cce2e32ca1424680 (diff)
downloadqtlocation-mapboxgl-upstream/astojilj-flaky-linux-only.tar.gz
Ignore flaky render tests only on linux.upstream/astojilj-flaky-linux-only
Related to: #14423, #14870, #14768, #14859
-rw-r--r--platform/node/test/ignores-linux.json6
-rw-r--r--platform/node/test/ignores.json4
-rw-r--r--platform/node/test/render.test.js9
3 files changed, 14 insertions, 5 deletions
diff --git a/platform/node/test/ignores-linux.json b/platform/node/test/ignores-linux.json
new file mode 100644
index 0000000000..2920f7db29
--- /dev/null
+++ b/platform/node/test/ignores-linux.json
@@ -0,0 +1,6 @@
+{
+ "render-tests/fill-pattern/literal": "FLAKY: do not re-enable without extensive testing - https://github.com/mapbox/mapbox-gl-native/issues/14423",
+ "render-tests/fill-pattern/opacity": "FLAKY: do not re-enable without extensive testing - https://github.com/mapbox/mapbox-gl-native/issues/14870",
+ "render-tests/fill-pattern/zoomed": "FLAKY: do not re-enable without extensive testing - https://github.com/mapbox/mapbox-gl-native/issues/14768",
+ "render-tests/line-translate/literal": "FLAKY: do not re-enable without extensive testing - https://github.com/mapbox/mapbox-gl-native/issues/14859"
+}
diff --git a/platform/node/test/ignores.json b/platform/node/test/ignores.json
index 5814114a15..01049f94c1 100644
--- a/platform/node/test/ignores.json
+++ b/platform/node/test/ignores.json
@@ -54,12 +54,8 @@
"render-tests/fill-extrusion-pattern/opacity": "https://github.com/mapbox/mapbox-gl-js/issues/3327",
"render-tests/fill-extrusion-pattern/feature-expression": "https://github.com/mapbox/mapbox-gl-js/issues/3327",
"render-tests/fill-extrusion-pattern/tile-buffer": "https://github.com/mapbox/mapbox-gl-js/issues/3327",
- "render-tests/fill-pattern/literal": "FLAKY: do not re-enable without extensive testing - https://github.com/mapbox/mapbox-gl-native/issues/14423",
- "render-tests/fill-pattern/opacity": "FLAKY: do not re-enable without extensive testing - https://github.com/mapbox/mapbox-gl-native/issues/14870",
"render-tests/fill-pattern/update-feature-state": "skip - port https://github.com/mapbox/mapbox-gl-js/pull/6263 - needs issue",
- "render-tests/fill-pattern/zoomed": "FLAKY: do not re-enable without extensive testing - https://github.com/mapbox/mapbox-gl-native/issues/14768",
"render-tests/geojson/inline-linestring-fill": "current behavior is arbitrary",
- "render-tests/line-translate/literal": "FLAKY: do not re-enable without extensive testing - https://github.com/mapbox/mapbox-gl-native/issues/14859",
"render-tests/mixed-zoom/z10-z11": "https://github.com/mapbox/mapbox-gl-native/issues/10397",
"render-tests/raster-masking/overlapping-zoom": "https://github.com/mapbox/mapbox-gl-native/issues/10195",
"render-tests/real-world/bangkok": "https://github.com/mapbox/mapbox-gl-native/issues/10412",
diff --git a/platform/node/test/render.test.js b/platform/node/test/render.test.js
index 950f8eb7ab..fca7843ee2 100644
--- a/platform/node/test/render.test.js
+++ b/platform/node/test/render.test.js
@@ -2,4 +2,11 @@ import {run} from '../../../mapbox-gl-js/test/integration/lib/render';
import implementation from './suite_implementation';
import ignores from './ignores.json';
-run('native', ignores, implementation);
+let platformIgnore = {};
+try {
+ platformIgnore = require('./ignores-' + process.platform + '.json');
+} catch (ex) {
+ console.error(ex);
+}
+
+run('native', Object.assign({}, ignores, platformIgnore), implementation);