diff --git a/.travis.yml b/.travis.yml index 38e085f5a..6589f7725 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ before_install: - sudo apt-get install -qq make libboost-dev libboost-filesystem-dev libboost-program-options-dev libboost-python-dev libboost-regex-dev libboost-system-dev libboost-thread-dev python-nose libicu-dev libpng-dev libjpeg-dev libtiff-dev libwebp-dev libz-dev libfreetype6-dev libxml2-dev libproj-dev libcairo-dev python-cairo-dev libsqlite3-dev postgresql-server-dev* script: - - ./configure CXX=${CXX} CC=${CC} DEBUG=True DEMO=False BINDINGS='python' CPP_TESTS=True CAIRO=True FAST=True && JOBS=2 make + - ./configure CXX=${CXX} CC=${CC} DEBUG=False DEMO=False BINDINGS='python' CPP_TESTS=True CAIRO=True FAST=True && JOBS=2 make - make test-local notifications: diff --git a/tests/python_tests/images/support/mapnik-wgs842merc-reprojection-render.png b/tests/python_tests/images/support/mapnik-wgs842merc-reprojection-render.png index 6a8094948..26da9fad9 100644 Binary files a/tests/python_tests/images/support/mapnik-wgs842merc-reprojection-render.png and b/tests/python_tests/images/support/mapnik-wgs842merc-reprojection-render.png differ diff --git a/tests/python_tests/reprojection_test.py b/tests/python_tests/reprojection_test.py index 14a48adf7..371ed217e 100644 --- a/tests/python_tests/reprojection_test.py +++ b/tests/python_tests/reprojection_test.py @@ -44,9 +44,9 @@ if 'shape' in mapnik.DatasourceCache.plugin_names(): mapnik.render(m,im) actual = '/tmp/mapnik-wgs842merc-reprojection-render.png' expected = 'images/support/mapnik-wgs842merc-reprojection-render.png' - im.save(actual) + im.save(actual,'png32') expected_im = mapnik.Image.open(expected) - eq_(im.tostring(),expected_im.tostring(), 'failed comparing actual (%s) and expected (%s)' % (actual,'tests/python_tests/'+ expected)) + eq_(im.tostring('png32'),expected_im.tostring('png32'), 'failed comparing actual (%s) and expected (%s)' % (actual,'tests/python_tests/'+ expected)) def test_visual_zoom_all_rendering2(): m = mapnik.Map(512,512) @@ -56,9 +56,9 @@ if 'shape' in mapnik.DatasourceCache.plugin_names(): mapnik.render(m,im) actual = '/tmp/mapnik-merc2wgs84-reprojection-render.png' expected = 'images/support/mapnik-merc2wgs84-reprojection-render.png' - im.save(actual) + im.save(actual,'png32') expected_im = mapnik.Image.open(expected) - eq_(im.tostring(),expected_im.tostring(), 'failed comparing actual (%s) and expected (%s)' % (actual,'tests/python_tests/'+ expected)) + eq_(im.tostring('png32'),expected_im.tostring('png32'), 'failed comparing actual (%s) and expected (%s)' % (actual,'tests/python_tests/'+ expected)) # maximum-extent read from map.xml def test_visual_zoom_all_rendering3(): @@ -69,9 +69,9 @@ if 'shape' in mapnik.DatasourceCache.plugin_names(): mapnik.render(m,im) actual = '/tmp/mapnik-merc2merc-reprojection-render1.png' expected = 'images/support/mapnik-merc2merc-reprojection-render1.png' - im.save(actual) + im.save(actual,'png32') expected_im = mapnik.Image.open(expected) - eq_(im.tostring(),expected_im.tostring(), 'failed comparing actual (%s) and expected (%s)' % (actual,'tests/python_tests/'+ expected)) + eq_(im.tostring('png32'),expected_im.tostring('png32'), 'failed comparing actual (%s) and expected (%s)' % (actual,'tests/python_tests/'+ expected)) # no maximum-extent def test_visual_zoom_all_rendering4(): @@ -83,9 +83,9 @@ if 'shape' in mapnik.DatasourceCache.plugin_names(): mapnik.render(m,im) actual = '/tmp/mapnik-merc2merc-reprojection-render2.png' expected = 'images/support/mapnik-merc2merc-reprojection-render2.png' - im.save(actual) + im.save(actual,'png32') expected_im = mapnik.Image.open(expected) - eq_(im.tostring(),expected_im.tostring(), 'failed comparing actual (%s) and expected (%s)' % (actual,'tests/python_tests/'+ expected)) + eq_(im.tostring('png32'),expected_im.tostring('png32'), 'failed comparing actual (%s) and expected (%s)' % (actual,'tests/python_tests/'+ expected)) if __name__ == "__main__": setup()