From 41edb666ce6483635e9a8e943af00de423ec3bd4 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Mon, 31 Aug 2015 16:26:17 -0700 Subject: Fix render test script --- platform/node/test/render.test.js | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) (limited to 'platform/node') diff --git a/platform/node/test/render.test.js b/platform/node/test/render.test.js index 87536891cf..6045aae385 100644 --- a/platform/node/test/render.test.js +++ b/platform/node/test/render.test.js @@ -47,7 +47,7 @@ function renderTest(style, info, base, key) { req.respond(err, { data: data }); }); }; - options.ratio = 1.0; + options.ratio = info[key].pixelRatio || 1; var map = new mbgl.Map(options); map.load(style); @@ -83,13 +83,20 @@ function renderTest(style, info, base, key) { compare(actual, expected, diff, t, function(err, diff) { t.error(err); - var allowed = ('diff' in info) ? info.diff : 0.001; - var color = diff <= allowed ? 'green' : 'red'; + var allowed = 0.001; + + if ('diff' in info[key]) { + if (typeof info[key].diff === 'number') { + allowed = info[key].diff; + } else if ('native' in info[key].diff) { + allowed = info[key].diff.native; + } + } results += format(resultTemplate, { name: base, key: key, - color: color, + color: diff <= allowed ? 'green' : 'red', error: err ? '

' + err + '

' : '', difference: diff, zoom: info.zoom || 0, @@ -99,7 +106,10 @@ function renderTest(style, info, base, key) { height: info.height || 512 }); - t.ok(diff <= allowed, 'actual matches expected'); + if (!info[key].ignored || !('native' in info[key].ignored)) { + t.ok(diff <= allowed, 'expected ' + diff + ' to be less than ' + allowed); + } + t.end(); }); }); -- cgit v1.2.1