Unite test pycaro [WIP]

Author: artemp

test/python_tests/save_map_test.py

@@ -1,31 +1,19 @@
-#!/usr/bin/env python
-
 import glob
 import os
 import tempfile
-
-from nose.tools import eq_
-
 import mapnik
+import pytest
 
-from .utilities import execution_path, run_all
-
+from .utilities import execution_path
 
 default_logging_severity = mapnik.logger.get_severity()
 
-
+@pytest.fixture(scope="module")
 def setup():
-    # make the tests silent to suppress unsupported params from harfbuzz tests
-    # TODO: remove this after harfbuzz branch merges
-    mapnik.logger.set_severity(getattr(mapnik.severity_type, "None"))
     # All of the paths used are relative, if we run the tests
     # from another directory we need to chdir()
     os.chdir(execution_path('.'))
-
-
-def teardown():
-    mapnik.logger.set_severity(default_logging_severity)
-
+    yield
 
 def compare_map(xml):
     m = mapnik.Map(256, 256)
@@ -56,7 +44,7 @@ def compare_map(xml):
     try:
         with open(test_map) as f1:
             with open(test_map2) as f2:
-                eq_(f1.read(), f2.read())
+                assert f1.read() == f2.read()
     except AssertionError as e:
         raise AssertionError(
             'serialized map "%s" not the same after being reloaded, \ncompare with command:\n\n$%s' %
@@ -69,7 +57,7 @@ def compare_map(xml):
         return False
 
 
-def test_compare_map():
+def test_compare_map(setup):
     good_maps = glob.glob("../data/good_maps/*.xml")
     good_maps = [os.path.normpath(p) for p in good_maps]
     # remove one map that round trips CDATA differently, but this is okay
@@ -89,7 +77,3 @@ def test_compare_map_deprecations():
     dep = [os.path.normpath(p) for p in dep]
     for m in dep:
         compare_map(m)
-
-if __name__ == "__main__":
-    setup()
-    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))

test/python_tests/shapeindex_test.py

@@ -1,24 +1,24 @@
-#!/usr/bin/env python
-
 import fnmatch
 import os
 import shutil
 from subprocess import PIPE, Popen
 
-from nose.tools import eq_
-
 import mapnik
+import pytest
 
-from .utilities import execution_path, run_all
-
+from .utilities import execution_path
 
+@pytest.fixture(scope="module")
 def setup():
     # All of the paths used are relative, if we run the tests
     # from another directory we need to chdir()
     os.chdir(execution_path('.'))
+    yield
+    index = '../data/sqlite/world.sqlite.index'
+    if os.path.exists(index):
+        os.unlink(index)
 
-
-def test_shapeindex():
+def test_shapeindex(setup):
     # first copy shapefiles to tmp directory
     source_dir = '../data/shp/'
     working_dir = '/tmp/mapnik-shp-tmp/'
@@ -53,8 +53,4 @@ def test_shapeindex():
                 count2 = count2 + 1
         except StopIteration:
             pass
-        eq_(count, count2)
-
-if __name__ == "__main__":
-    setup()
-    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))
+        assert count == count2

test/python_tests/sqlite_rtree_test.py

@@ -1,35 +1,31 @@
-#!/usr/bin/env python
 import os
 import sqlite3
 import sys
 import threading
-
-from nose.tools import eq_
-
 import mapnik
-
-from .utilities import execution_path, run_all
-
-PYTHON3 = sys.version_info[0] == 3
+import pytest
+from .utilities import execution_path
 
 
+@pytest.fixture(scope="module")
 def setup():
     # All of the paths used are relative, if we run the tests
     # from another directory we need to chdir()
     os.chdir(execution_path('.'))
+    yield
+
 
 NUM_THREADS = 10
 TOTAL = 245
 
-
 def create_ds(test_db, table):
     ds = mapnik.SQLite(file=test_db, table=table)
     ds.all_features()
     del ds
 
 if 'sqlite' in mapnik.DatasourceCache.plugin_names():
 
-    def test_rtree_creation():
+    def test_rtree_creation(setup):
         test_db = '../data/sqlite/world.sqlite'
         index = test_db + '.index'
         table = 'world_merc'
@@ -46,7 +42,7 @@ def test_rtree_creation():
         for i in threads:
             i.join()
 
-        eq_(os.path.exists(index), True)
+        assert os.path.exists(index)
         conn = sqlite3.connect(index)
         cur = conn.cursor()
         try:
@@ -55,7 +51,7 @@ def test_rtree_creation():
                 table.replace(
                     "'", ""))
             conn.commit()
-            eq_(cur.fetchone()[0], TOTAL)
+            assert cur.fetchone()[0] == TOTAL
         except sqlite3.OperationalError:
             # don't worry about testing # of index records if
             # python's sqlite module does not support rtree
@@ -66,13 +62,13 @@ def test_rtree_creation():
         ds = mapnik.SQLite(file=test_db, table=table)
         fs = list(ds.all_features())
         del ds
-        eq_(len(fs), TOTAL)
+        assert len(fs) == TOTAL
         os.unlink(index)
         ds = mapnik.SQLite(file=test_db, table=table, use_spatial_index=False)
         fs = list(ds.all_features())
         del ds
-        eq_(len(fs), TOTAL)
-        eq_(os.path.exists(index), False)
+        assert len(fs) == TOTAL
+        assert os.path.exists(index) ==  False
 
         ds = mapnik.SQLite(file=test_db, table=table, use_spatial_index=True)
         fs = list(ds.all_features())
@@ -82,10 +78,10 @@ def test_rtree_creation():
         # for feat in fs:
         #    query = mapnik.Query(feat.envelope())
         #    selected = ds.features(query)
-        #    eq_(len(selected.features)>=1,True)
+        #    assert len(selected.features)>=1 == True
         del ds
 
-        eq_(os.path.exists(index), True)
+        assert os.path.exists(index) ==  True
         os.unlink(index)
 
     test_rtree_creation.requires_data = True
@@ -148,17 +144,17 @@ def make_wkb_point(x, y):
 
         # confirm the wkb matches a manually formed wkb
         wkb2 = make_wkb_point(x, y)
-        eq_(wkb, wkb2)
+        assert wkb ==  wkb2
 
         # ensure we can read this data back out properly with mapnik
         ds = mapnik.Datasource(
             **{'type': 'sqlite', 'file': test_db, 'table': 'point_table'})
         fs = ds.featureset()
         feat = fs.next()
-        eq_(feat.id(), 1)
-        eq_(feat['name'], 'test point')
+        assert feat.id() ==  1
+        assert feat['name'] == 'test point'
         geom = feat.geometry
-        eq_(geom.to_wkt(), 'POINT(-122 48)')
+        assert geom.to_wkt() == 'POINT(-122 48)'
         del ds
 
         # ensure it matches data read with just sqlite
@@ -169,19 +165,12 @@ def make_wkb_point(x, y):
         result = cur.fetchone()
         cur.close()
         feat_id = result[0]
-        eq_(feat_id, 1)
+        assert feat_id ==  1
         name = result[2]
-        eq_(name, 'test point')
+        assert name ==  'test point'
         geom_wkb_blob = result[1]
-        if not PYTHON3:
-            geom_wkb_blob = str(geom_wkb_blob)
-        eq_(geom_wkb_blob, geom.to_wkb(mapnik.wkbByteOrder.NDR))
+        assert geom_wkb_blob == geom.to_wkb(mapnik.wkbByteOrder.NDR)
         new_geom = mapnik.Geometry.from_wkb(geom_wkb_blob)
-        eq_(new_geom.to_wkt(), geom.to_wkt())
+        assert new_geom.to_wkt() == geom.to_wkt()
         conn.close()
         os.unlink(test_db)
-
-if __name__ == "__main__":
-    setup()
-    returncode = run_all(eval(x) for x in dir() if x.startswith("test_"))
-    exit(returncode)