Merge pull request #2343 from strk/2.3.x-false-negatives

Fix false negative responses from python tests

tests/python_tests/agg_rasterizer_integer_overflow_test.py

@@ -37,4 +37,4 @@ def test_that_coordinates_do_not_overflow_and_polygon_is_rendered():
   eq_(im.get_pixel(128,128),expected_color.packed())
 
 if __name__ == "__main__":
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))

tests/python_tests/box2d_test.py

@@ -174,4 +174,4 @@ def test_envelope_clipping():
     eq_(e1,e2)
 
 if __name__ == "__main__":
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))

tests/python_tests/buffer_clear_test.py

@@ -60,4 +60,4 @@ if mapnik.has_grid_renderer():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))

tests/python_tests/cairo_test.py

@@ -190,4 +190,4 @@ if mapnik.has_pycairo():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))

tests/python_tests/compositing_test.py

@@ -259,4 +259,4 @@ def test_background_image_with_alpha_and_background_color_against_composited_con
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))

tests/python_tests/datasource_test.py

@@ -125,4 +125,4 @@ def test_hit_grid():
 
 if __name__ == '__main__':
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))

tests/python_tests/datasource_xml_template_test.py

@@ -21,4 +21,4 @@ def test_datasource_template_is_working():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))

tests/python_tests/extra_map_props_test.py

@@ -34,4 +34,4 @@ def test_serializing_arbitrary_parameters():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))

tests/python_tests/feature_id_test.py

@@ -63,4 +63,4 @@ def test_feature_hit_count():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))

tests/python_tests/feature_test.py

@@ -96,4 +96,4 @@ def test_feature_expression_evaluation_attr_with_spaces():
     eq_(expr.evaluate(f),True)
 
 if __name__ == "__main__":
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))

tests/python_tests/filter_test.py

@@ -442,4 +442,4 @@ def test_division_by_zero():
     eq_(expr.evaluate(f),None)
 
 if __name__ == "__main__":
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))

tests/python_tests/font_test.py

@@ -13,4 +13,4 @@ import mapnik
 #    ts = mapnik.TextSymbolizer('Name', 'Invalid Font Name', int(8), mapnik.Color('black'))
 
 if __name__ == "__main__":
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))

tests/python_tests/fontset_test.py

@@ -39,4 +39,4 @@ def test_loading_fontset_from_python():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))

tests/python_tests/geojson_plugin_test.py

@@ -76,4 +76,4 @@ if 'geojson' in mapnik.DatasourceCache.plugin_names():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))

tests/python_tests/geometry_io_test.py

@@ -296,4 +296,4 @@ def test_handling_geojson_null_geoms():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))

tests/python_tests/grayscale_test.py

@@ -10,4 +10,4 @@ def test_grayscale_conversion():
     eq_((pixel >> 24) & 0xff,255);
 
 if __name__ == "__main__":
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))

tests/python_tests/image_encoding_speed_test.py

@@ -124,4 +124,4 @@ def do_encoding():
 if __name__ == "__main__":
     setup()
     do_encoding()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))

tests/python_tests/image_filters_test.py

@@ -65,4 +65,4 @@ if 'shape' in mapnik.DatasourceCache.plugin_names():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))

tests/python_tests/image_test.py

@@ -79,4 +79,4 @@ def test_image_open_from_string():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))

tests/python_tests/introspection_test.py

@@ -68,4 +68,4 @@ def test_introspect_symbolizers():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))

tests/python_tests/json_feature_properties_test.py

@@ -100,4 +100,4 @@ def test_char_escaping():
         eq_(pyjson['properties']['name'],expected)
 
 if __name__ == "__main__":
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))

tests/python_tests/layer_buffer_size_test.py

@@ -32,4 +32,4 @@ if 'sqlite' in mapnik.DatasourceCache.plugin_names():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))

tests/python_tests/layer_modification_test.py

@@ -72,4 +72,4 @@ def test_adding_datasource_to_layer():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))

tests/python_tests/layer_test.py

@@ -25,4 +25,4 @@ def test_layer_init():
     eq_(len(l.styles),0)
 
 if __name__ == "__main__":
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))

tests/python_tests/load_map_test.py

@@ -57,4 +57,4 @@ def test_good_files():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))

tests/python_tests/map_query_test.py

@@ -101,4 +101,4 @@ if 'shape' in mapnik.DatasourceCache.plugin_names():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))

tests/python_tests/mapnik_config_test.py

@@ -77,4 +77,4 @@ def test_mapnik_config_valid_and_invalid_option():
     eq_(process.returncode,0)
 
 if __name__ == "__main__":
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))

tests/python_tests/mapnik_logger_test.py

@@ -15,4 +15,4 @@ def test_logger_init():
     eq_(mapnik.logger.get_severity(),default)
 
 if __name__ == "__main__":
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))

tests/python_tests/markers_complex_rendering_test.py

@@ -37,4 +37,4 @@ if 'csv' in mapnik.DatasourceCache.plugin_names():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))

tests/python_tests/memory_datasource_test.py

@@ -31,4 +31,4 @@ def test_add_feature():
     eq_(len(retrieved), 0)
 
 if __name__ == "__main__":
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))

tests/python_tests/multi_tile_raster_test.py

@@ -65,4 +65,4 @@ def test_multi_tile_policy():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))

tests/python_tests/ogr_and_shape_geometries_test.py

@@ -41,4 +41,4 @@ if 'shape' in plugins and 'ogr' in plugins:
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))

tests/python_tests/ogr_test.py

@@ -62,4 +62,4 @@ if 'ogr' in mapnik.DatasourceCache.plugin_names():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))

tests/python_tests/osm_test.py

@@ -49,4 +49,4 @@ if 'osm' in mapnik.DatasourceCache.plugin_names():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))

tests/python_tests/palette_test.py

@@ -47,4 +47,4 @@ if 'shape' in mapnik.DatasourceCache.plugin_names():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))

tests/python_tests/parameters_test.py

@@ -58,4 +58,4 @@ def test_parameters():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))

tests/python_tests/pickling_test.py

@@ -42,4 +42,4 @@ def test_parameters_pickle():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))

tests/python_tests/png_encoding_test.py

@@ -161,4 +161,4 @@ if mapnik.has_png():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))

tests/python_tests/pngsuite_test.py

@@ -32,4 +32,4 @@ def test_broken_pngs():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))

tests/python_tests/postgis_test.py

@@ -1016,4 +1016,4 @@ if 'postgis' in mapnik.DatasourceCache.plugin_names() \
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))

tests/python_tests/projection_test.py

@@ -115,4 +115,4 @@ def test_proj_transform_between_init_and_literal():
 
 
 if __name__ == "__main__":
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))

tests/python_tests/query_test.py

@@ -34,4 +34,4 @@ def test_query_resolution():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))

tests/python_tests/query_tolerance_test.py

@@ -40,4 +40,4 @@ if 'shape' in mapnik.DatasourceCache.plugin_names():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))

tests/python_tests/raster_colorizer_test.py

@@ -87,4 +87,4 @@ def test_stop_label():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))

tests/python_tests/raster_symbolizer_test.py

@@ -195,4 +195,4 @@ def test_raster_warping_does_not_overclip_source():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))

tests/python_tests/render_grid_test.py

@@ -383,4 +383,4 @@ if mapnik.has_grid_renderer():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))

tests/python_tests/render_test.py

@@ -237,4 +237,4 @@ if 'shape' in mapnik.DatasourceCache.plugin_names():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))

tests/python_tests/reprojection_test.py

@@ -89,4 +89,4 @@ if 'shape' in mapnik.DatasourceCache.plugin_names():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))

tests/python_tests/save_map_test.py

@@ -63,4 +63,4 @@ def test_compare_map():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))

tests/python_tests/shapefile_test.py

@@ -110,4 +110,4 @@ if 'shape' in mapnik.DatasourceCache.plugin_names():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))

tests/python_tests/sqlite_rtree_test.py

@@ -156,4 +156,4 @@ if 'sqlite' in mapnik.DatasourceCache.plugin_names():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))

tests/python_tests/sqlite_test.py

@@ -418,4 +418,4 @@ if 'sqlite' in mapnik.DatasourceCache.plugin_names():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))

tests/python_tests/style_test.py

@@ -16,4 +16,4 @@ def test_style_init():
    eq_(s.image_filters_inflate,False)
 
 if __name__ == "__main__":
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))

tests/python_tests/webp_encoding_test.py

@@ -159,4 +159,4 @@ if mapnik.has_webp():
 
 if __name__ == "__main__":
     setup()
-    run_all(eval(x) for x in dir() if x.startswith("test_"))
+    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))