diff --git a/tests/python_tests/image_filters_test.py b/tests/python_tests/image_filters_test.py index c122294c9..88277d1f2 100644 --- a/tests/python_tests/image_filters_test.py +++ b/tests/python_tests/image_filters_test.py @@ -50,7 +50,7 @@ if 'shape' in mapnik.DatasourceCache.plugin_names(): actual = '/tmp/mapnik-style-image-filter-' + filename + '.png' expected = 'images/style-image-filter/' + filename + '.png' im.save(actual,"png32") - if not os.path.exists(expected): + if not os.path.exists(expected) or os.environ.get('UPDATE'): print 'generating expected test image: %s' % expected im.save(expected,'png32') expected_im = mapnik.Image.open(expected) diff --git a/tests/python_tests/images/style-image-filter/agg-stack-blur22.png b/tests/python_tests/images/style-image-filter/agg-stack-blur22.png index b6050539f..746c561cb 100644 Binary files a/tests/python_tests/images/style-image-filter/agg-stack-blur22.png and b/tests/python_tests/images/style-image-filter/agg-stack-blur22.png differ diff --git a/tests/python_tests/images/style-image-filter/blur.png b/tests/python_tests/images/style-image-filter/blur.png index 64e82968d..2d438c39d 100644 Binary files a/tests/python_tests/images/style-image-filter/blur.png and b/tests/python_tests/images/style-image-filter/blur.png differ diff --git a/tests/python_tests/images/style-image-filter/edge-detect.png b/tests/python_tests/images/style-image-filter/edge-detect.png index 89b06685f..58dec8a04 100644 Binary files a/tests/python_tests/images/style-image-filter/edge-detect.png and b/tests/python_tests/images/style-image-filter/edge-detect.png differ diff --git a/tests/python_tests/images/style-image-filter/emboss.png b/tests/python_tests/images/style-image-filter/emboss.png index f6344727f..5a23fd379 100644 Binary files a/tests/python_tests/images/style-image-filter/emboss.png and b/tests/python_tests/images/style-image-filter/emboss.png differ diff --git a/tests/python_tests/images/style-image-filter/gray.png b/tests/python_tests/images/style-image-filter/gray.png index 36e6df7f8..73a401533 100644 Binary files a/tests/python_tests/images/style-image-filter/gray.png and b/tests/python_tests/images/style-image-filter/gray.png differ diff --git a/tests/python_tests/images/style-image-filter/invert.png b/tests/python_tests/images/style-image-filter/invert.png index ffc1e03a3..b87a15bee 100644 Binary files a/tests/python_tests/images/style-image-filter/invert.png and b/tests/python_tests/images/style-image-filter/invert.png differ diff --git a/tests/python_tests/images/style-image-filter/none.png b/tests/python_tests/images/style-image-filter/none.png index b745b75d0..7546b09b5 100644 Binary files a/tests/python_tests/images/style-image-filter/none.png and b/tests/python_tests/images/style-image-filter/none.png differ diff --git a/tests/python_tests/images/style-image-filter/sharpen.png b/tests/python_tests/images/style-image-filter/sharpen.png index 3c1130634..5fff1d85f 100644 Binary files a/tests/python_tests/images/style-image-filter/sharpen.png and b/tests/python_tests/images/style-image-filter/sharpen.png differ diff --git a/tests/python_tests/images/style-image-filter/sobel.png b/tests/python_tests/images/style-image-filter/sobel.png index 281d99aa7..0f667c343 100644 Binary files a/tests/python_tests/images/style-image-filter/sobel.png and b/tests/python_tests/images/style-image-filter/sobel.png differ diff --git a/tests/python_tests/images/style-image-filter/x-gradient.png b/tests/python_tests/images/style-image-filter/x-gradient.png index fc19f8b1a..fb790ec07 100644 Binary files a/tests/python_tests/images/style-image-filter/x-gradient.png and b/tests/python_tests/images/style-image-filter/x-gradient.png differ diff --git a/tests/python_tests/images/style-image-filter/y-gradient.png b/tests/python_tests/images/style-image-filter/y-gradient.png index 1d0bbf20a..c6a38de00 100644 Binary files a/tests/python_tests/images/style-image-filter/y-gradient.png and b/tests/python_tests/images/style-image-filter/y-gradient.png differ diff --git a/tests/python_tests/images/support/mapnik-marker-ellipse-render1.png b/tests/python_tests/images/support/mapnik-marker-ellipse-render1.png index 254f81172..7854c5621 100644 Binary files a/tests/python_tests/images/support/mapnik-marker-ellipse-render1.png and b/tests/python_tests/images/support/mapnik-marker-ellipse-render1.png differ diff --git a/tests/python_tests/images/support/mapnik-marker-ellipse-render2.png b/tests/python_tests/images/support/mapnik-marker-ellipse-render2.png index c2cd87699..c2a4963c3 100644 Binary files a/tests/python_tests/images/support/mapnik-marker-ellipse-render2.png and b/tests/python_tests/images/support/mapnik-marker-ellipse-render2.png differ diff --git a/tests/python_tests/markers_complex_rendering_test.py b/tests/python_tests/markers_complex_rendering_test.py index f66277f70..41f0a0eff 100644 --- a/tests/python_tests/markers_complex_rendering_test.py +++ b/tests/python_tests/markers_complex_rendering_test.py @@ -19,11 +19,12 @@ if 'csv' in mapnik.DatasourceCache.plugin_names(): actual = '/tmp/mapnik-marker-ellipse-render1.png' expected = 'images/support/mapnik-marker-ellipse-render1.png' im.save(actual,'png32') + if os.environ.get('UPDATE'): + im.save(expected,'png32') expected_im = mapnik.Image.open(expected) eq_(im.tostring('png32'),expected_im.tostring('png32'), 'failed comparing actual (%s) and expected (%s)' % (actual,'tests/python_tests/'+ expected)) def test_marker_ellipse_render2(): - # currently crashes https://github.com/mapnik/mapnik/issues/1365 m = mapnik.Map(256,256) mapnik.load_map(m,'../data/good_maps/marker_ellipse_transform2.xml') m.zoom_all() @@ -32,6 +33,8 @@ if 'csv' in mapnik.DatasourceCache.plugin_names(): actual = '/tmp/mapnik-marker-ellipse-render2.png' expected = 'images/support/mapnik-marker-ellipse-render2.png' im.save(actual,'png32') + if os.environ.get('UPDATE'): + im.save(expected,'png32') expected_im = mapnik.Image.open(expected) eq_(im.tostring('png32'),expected_im.tostring('png32'), 'failed comparing actual (%s) and expected (%s)' % (actual,'tests/python_tests/'+ expected))