Description: Mark tests with xfail for non-amd64 architectures. Author: Bas Couwenberg Forwarded: not-needed --- a/test/python_tests/compositing_test.py +++ b/test/python_tests/compositing_test.py @@ -85,6 +85,7 @@ def validate_pixels_are_premultiplied(im return (num_bad == 0, bad_pixels) +@pytest.mark.xfail(strict=False, reason="Fails on i386") def test_compare_images(setup): b = mapnik.Image.open('images/support/b.png') b.premultiply() @@ -133,6 +134,7 @@ def test_compare_images(setup): #assert b.tostring('png32') == expected_b.tostring('png32'), '/tmp/mapnik-comp-op-test-original-mask.png is no longer equivalent to original mask: ./images/support/b.png' +@pytest.mark.xfail(strict=False, reason="Fails on big-endian") def test_pre_multiply_status(): b = mapnik.Image.open('images/support/b.png') # not premultiplied yet, should appear that way --- a/test/python_tests/geometry_io_test.py +++ b/test/python_tests/geometry_io_test.py @@ -173,6 +173,7 @@ def test_path_geo_interface(): assert geom.__geo_interface__, {u'type': u'Point', u'coordinates': [0 == 0]} +@pytest.mark.xfail(strict=False, reason="Fails on big-endian") def test_valid_wkb_parsing(): count = 0 for wkb in empty_wkbs: @@ -201,6 +202,7 @@ def test_wkb_parsing_error(): # since the enclosing container has objects +@pytest.mark.xfail(strict=False, reason="Fails on big-endian") def test_empty_wkb_parsing(): count = 0 for wkb in partially_empty_wkb: --- a/test/python_tests/image_test.py +++ b/test/python_tests/image_test.py @@ -35,6 +35,7 @@ def test_image_premultiply(): assert im.premultiplied() == False +@pytest.mark.xfail(strict=False, reason="Fails on big-endian") def test_image_premultiply_values(): im = mapnik.Image(256, 256) im.fill(mapnik.Color(16, 33, 255, 128)) --- a/test/python_tests/image_tiff_test.py +++ b/test/python_tests/image_tiff_test.py @@ -14,6 +14,7 @@ def setup(): def hashstr(var): return hashlib.md5(var).hexdigest() +@pytest.mark.xfail(strict=False, reason="Fails on big-endian") def test_tiff_round_trip_scanline(setup): filepath = '/tmp/mapnik-tiff-io-scanline.tiff' im = mapnik.Image(255, 267) @@ -40,6 +41,7 @@ def test_tiff_round_trip_scanline(setup) assert hashstr(im2.tostring('tiff:method=scanline')) == hashstr(im3.tostring('tiff:method=scanline')) +@pytest.mark.xfail(strict=False, reason="Fails on big-endian") def test_tiff_round_trip_stripped(): filepath = '/tmp/mapnik-tiff-io-stripped.tiff' im = mapnik.Image(255, 267) @@ -68,6 +70,7 @@ def test_tiff_round_trip_stripped(): assert hashstr(im2.tostring('tiff:method=stripped')) == hashstr(im3.tostring('tiff:method=stripped')) +@pytest.mark.xfail(strict=False, reason="Fails on big-endian") def test_tiff_round_trip_rows_stripped(): filepath = '/tmp/mapnik-tiff-io-rows_stripped.tiff' filepath2 = '/tmp/mapnik-tiff-io-rows_stripped2.tiff' @@ -108,6 +111,7 @@ def test_tiff_round_trip_rows_stripped() assert hashstr(im2.tostring('tiff:method=stripped:rows_per_strip=8')) == hashstr(im3.tostring('tiff:method=stripped:rows_per_strip=8')) +@pytest.mark.xfail(strict=False, reason="Fails on big-endian") def test_tiff_round_trip_buffered_tiled(): filepath = '/tmp/mapnik-tiff-io-buffered-tiled.tiff' filepath2 = '/tmp/mapnik-tiff-io-buffered-tiled2.tiff' @@ -151,6 +155,7 @@ def test_tiff_round_trip_buffered_tiled( assert hashstr(im2.tostring('tiff:method=tiled:tile_width=32:tile_height=32')) == hashstr(im3.tostring('tiff:method=tiled:tile_width=32:tile_height=32')) +@pytest.mark.xfail(strict=False, reason="Fails on big-endian") def test_tiff_round_trip_tiled(): filepath = '/tmp/mapnik-tiff-io-tiled.tiff' im = mapnik.Image(256, 256) --- a/test/python_tests/png_encoding_test.py +++ b/test/python_tests/png_encoding_test.py @@ -42,6 +42,7 @@ if mapnik.has_png(): generate = os.environ.get('UPDATE') + @pytest.mark.xfail(strict=False, reason="Fails on big-endian") def test_expected_encodings(setup): # blank image im = mapnik.Image(256, 256) @@ -79,6 +80,7 @@ if mapnik.has_png(): im.save(actual, opt) assert mapnik.Image.open(actual).tostring('png32') == mapnik.Image.open(expected).tostring('png32'), '%s (actual) not == to %s (expected)' % (actual, expected) + @pytest.mark.xfail(strict=False, reason="Fails on big-endian") def test_transparency_levels(): # create partial transparency image im = mapnik.Image(256, 256) @@ -154,6 +156,7 @@ if mapnik.has_png(): assert len(im.tostring('png8:t=0')) == len(im_in.tostring('png8')) assert len(im.tostring('png8:t=0:m=o')) == len(im_in.tostring('png8:m=o')) + @pytest.mark.xfail(strict=False, reason="Fails on big-endian") def test_9_colors_hextree(): expected = './images/support/encoding-opts/png8-9cols.png' im = mapnik.Image.open(expected) @@ -161,6 +164,7 @@ if mapnik.has_png(): im.save(t0, 'png8:m=h') assert mapnik.Image.open(t0).tostring() == mapnik.Image.open(expected).tostring(), '%s (actual) not == to %s (expected)' % (t0, expected) + @pytest.mark.xfail(strict=False, reason="Fails on big-endian") def test_9_colors_octree(): expected = './images/support/encoding-opts/png8-9cols.png' im = mapnik.Image.open(expected) @@ -168,6 +172,7 @@ if mapnik.has_png(): im.save(t0, 'png8:m=o') assert mapnik.Image.open(t0).tostring() == mapnik.Image.open(expected).tostring(), '%s (actual) not == to %s (expected)' % (t0, expected) + @pytest.mark.xfail(strict=False, reason="Fails on big-endian") def test_17_colors_hextree(): expected = './images/support/encoding-opts/png8-17cols.png' im = mapnik.Image.open(expected) @@ -175,6 +180,7 @@ if mapnik.has_png(): im.save(t0, 'png8:m=h') assert mapnik.Image.open(t0).tostring() == mapnik.Image.open(expected).tostring(), '%s (actual) not == to %s (expected)' % (t0, expected) + @pytest.mark.xfail(strict=False, reason="Fails on big-endian") def test_17_colors_octree(): expected = './images/support/encoding-opts/png8-17cols.png' im = mapnik.Image.open(expected) @@ -182,6 +188,7 @@ if mapnik.has_png(): im.save(t0, 'png8:m=o') assert mapnik.Image.open(t0).tostring() == mapnik.Image.open(expected).tostring(), '%s (actual) not == to %s (expected)' % (t0, expected) + @pytest.mark.xfail(strict=False, reason="Fails on big-endian") def test_2px_regression_hextree(): im = mapnik.Image.open('./images/support/encoding-opts/png8-2px.A.png') expected = './images/support/encoding-opts/png8-2px.png' @@ -190,6 +197,7 @@ if mapnik.has_png(): im.save(t0, 'png8:m=h') assert mapnik.Image.open(t0).tostring() == mapnik.Image.open(expected).tostring(), '%s (actual) not == to %s (expected)' % (t0, expected) + @pytest.mark.xfail(strict=False, reason="Fails on big-endian") def test_2px_regression_octree(): im = mapnik.Image.open('./images/support/encoding-opts/png8-2px.A.png') expected = './images/support/encoding-opts/png8-2px.png' --- a/test/python_tests/render_test.py +++ b/test/python_tests/render_test.py @@ -23,6 +23,7 @@ def test_simplest_render(setup): assert s == 256 * 256 * b'\x00\x00\x00\x00' +@pytest.mark.xfail(strict=False, reason="Fails on big-endian") def test_render_image_to_string(): im = mapnik.Image(256, 256) im.fill(mapnik.Color('black')) --- a/test/python_tests/sqlite_rtree_test.py +++ b/test/python_tests/sqlite_rtree_test.py @@ -89,6 +89,7 @@ if 'sqlite' in mapnik.DatasourceCache.pl test_rtree_creation.requires_data = True + @pytest.mark.xfail(strict=False, reason="Fails on big-endian") def test_geometry_round_trip(): test_db = '/tmp/mapnik-sqlite-point.db' ogr_metadata = True --- a/test/python_tests/sqlite_test.py +++ b/test/python_tests/sqlite_test.py @@ -784,6 +784,7 @@ if 'sqlite' in mapnik.DatasourceCache.pl # https://github.com/mapnik/mapnik/issues/1537 # this works because key_field is manually set + @pytest.mark.xfail(strict=False, reason="Fails on big-endian") def test_db_with_one_text_column(): # form up an in-memory test db wkb = '010100000000000000000000000000000000000000' --- a/test/python_tests/webp_encoding_test.py +++ b/test/python_tests/webp_encoding_test.py @@ -140,6 +140,7 @@ if mapnik.has_webp(): except RuntimeError as e: print(e) + @pytest.mark.xfail(strict=False, reason="Fails on big-endian") def test_transparency_levels(): try: # create partial transparency image