make tests runnable in parallel

lonvia · lonvia · commit 301d1b2135a9 · 2025-07-29T11:27:44.000+02:00
Avoid hard-coded file names and non-local objects. Mark tests
that cannot be run in parallel.
diff --git a/test/conftest.py b/test/conftest.py
@@ -19,10 +19,10 @@
 BUILD_DIR = "build/lib.{}-{}.{}".format(sysconfig.get_platform(),
                                         sys.version_info[0], sys.version_info[1])
 
-
 if not (SRC_DIR / BUILD_DIR).exists():
-    BUILD_DIR = "build/lib.{}-{}".format(sysconfig.get_platform(),
-                                         sys.implementation.cache_tag)
+    BUILD_DIR = "build/lib.{}-{}{}".format(sysconfig.get_platform(),
+                                           sys.implementation.cache_tag,
+                                           getattr(sys, 'abiflags', ''))
 
 if (SRC_DIR / BUILD_DIR).exists():
     sys.path.insert(0, str(SRC_DIR))
diff --git a/test/test_area.py b/test/test_area.py
@@ -6,6 +6,7 @@
 # For a full list of authors see the git log.
 from pathlib import Path
 
+import pytest
 import osmium
 
 from helpers import CountingHandler
@@ -14,6 +15,7 @@
 TEST_FILE = str((Path(__file__) / '..' / 'example-test.pbf').resolve())
 
 
+@pytest.mark.thread_unsafe
 def test_area_handler():
     area = osmium.area.AreaManager()
 
diff --git a/test/test_back_reference_writer.py b/test/test_back_reference_writer.py
@@ -5,6 +5,7 @@
 # Copyright (C) 2025 Sarah Hoffmann <lonvia@denofr.de> and others.
 # For a full list of authors see the git log.
 import pytest
+import uuid
 
 import osmium
 
@@ -18,7 +19,7 @@ class TestWay:
         id = 34
         nodes = [3, 6, 5]
 
-    outfile = str(tmp_path / 'test.osm')
+    outfile = str(tmp_path / f'{uuid.uuid4()}.osm')
 
     with osmium.BackReferenceWriter(outfile, ref_file) as writer:
         writer.add_way(TestWay())
@@ -33,7 +34,7 @@ class TestWay:
 
 def test_do_not_write_on_exception(test_data, tmp_path):
     ref_file = test_data('\n'.join((f"n{i} x2 y3" for i in range(10))))
-    outfile = tmp_path / 'test.osm'
+    outfile = tmp_path / f'{uuid.uuid4()}.osm'
 
     with pytest.raises(RuntimeError, match="inner error"):
         with osmium.BackReferenceWriter(str(outfile), ref_file):
diff --git a/test/test_dangling_references.py b/test/test_dangling_references.py
@@ -9,6 +9,8 @@
 import pytest
 import osmium
 
+pytestmark = pytest.mark.iterations(1)
+
 TEST_DIR = (Path(__file__) / '..').resolve()
 
 
diff --git a/test/test_empty_tag_filter.py b/test/test_empty_tag_filter.py
@@ -12,7 +12,8 @@
 
 @pytest.fixture
 def reader(opl_reader):
-    return opl_reader("""\
+    def _mk():
+        return opl_reader("""\
                n1 x1 y1
                n2 x1 y1 Tfoo=bar
                w1 Nn1,n2 Thighway=road
@@ -23,11 +24,13 @@ def reader(opl_reader):
                c223
                """)
 
+    return _mk
+
 
 def test_filter_default_config(reader):
     pre = IDCollector()
     post = IDCollector()
-    osmium.apply(reader, pre, osmium.filter.EmptyTagFilter(), post)
+    osmium.apply(reader(), pre, osmium.filter.EmptyTagFilter(), post)
 
     assert pre.nodes == [1, 2]
     assert post.nodes == [2]
@@ -42,7 +45,7 @@ def test_filter_default_config(reader):
 def test_filter_restrict_entity(reader):
     pre = IDCollector()
     post = IDCollector()
-    osmium.apply(reader, pre,
+    osmium.apply(reader(), pre,
                  osmium.filter.EmptyTagFilter().enable_for(osmium.osm.WAY | osmium.osm.RELATION),
                  post)
 
@@ -57,7 +60,7 @@ def test_filter_restrict_entity(reader):
 def test_filter_chained(reader):
     pre = IDCollector()
     post = IDCollector()
-    osmium.apply(reader, pre,
+    osmium.apply(reader(), pre,
                  osmium.filter.EmptyTagFilter().enable_for(osmium.osm.NODE),
                  osmium.filter.EmptyTagFilter().enable_for(osmium.osm.WAY),
                  post)
diff --git a/test/test_examples.py b/test/test_examples.py
@@ -9,6 +9,7 @@
 """
 from pathlib import Path
 
+import pytest
 
 TEST_DIR = (Path(__file__) / '..').resolve()
 TEST_FILE = TEST_DIR / 'example-test.pbf'
@@ -26,6 +27,7 @@ def run_example(name, *args):
 
 
 def test_amenity_list(capsys):
+    pytest.importorskip("shapely")
     assert 0 == run_example("amenity_list", TEST_FILE)
 
     output = capsys.readouterr().out.splitlines()
diff --git a/test/test_file_processor.py b/test/test_file_processor.py
@@ -5,6 +5,7 @@
 # Copyright (C) 2025 Sarah Hoffmann <lonvia@denofr.de> and others.
 # For a full list of authors see the git log.
 import pytest
+import uuid
 
 import osmium
 from helpers import IDCollector
@@ -125,7 +126,7 @@ def test_generator_with_filter(opl_buffer):
 
 
 def test_file_processor_header(tmp_path):
-    fn = tmp_path / 'empty.xml'
+    fn = tmp_path / f"{uuid.uuid4()}.xml"
     fn.write_text("""<?xml version='1.0' encoding='UTF-8'?>
     <osm version="0.6" generator="test-pyosmium" timestamp="2014-08-26T20:22:02Z">
          <bounds minlat="-90" minlon="-180" maxlat="90" maxlon="180"/>
@@ -234,7 +235,7 @@ def test_filtered_handler_basehandler(opl_buffer, tmp_path):
             r4
             """)
 
-    testf = tmp_path / 'test.opl'
+    testf = tmp_path / f"{uuid.uuid4()}.opl"
 
     with osmium.SimpleWriter(str(testf)) as writer:
         fp = osmium.FileProcessor(data)\
diff --git a/test/test_forward_reference_writer.py b/test/test_forward_reference_writer.py
@@ -4,6 +4,7 @@
 #
 # Copyright (C) 2025 Sarah Hoffmann <lonvia@denofr.de> and others.
 # For a full list of authors see the git log.
+import uuid
 import pytest
 
 import osmium
@@ -32,7 +33,7 @@ def __init__(self, nid):
 
 
 def test_simple_forward_no_back_reference(ref_file, tmp_path):
-    outfile = str(tmp_path / 'test.osm')
+    outfile = tmp_path / f"{uuid.uuid4()}.osm"
 
     with osmium.ForwardReferenceWriter(outfile, ref_file, back_references=False) as writer:
         writer.add_node(DummyNode(2))
@@ -47,7 +48,7 @@ def test_simple_forward_no_back_reference(ref_file, tmp_path):
 
 
 def test_simple_forward_with_back_reference(ref_file, tmp_path):
-    outfile = str(tmp_path / 'test.osm')
+    outfile = str(tmp_path / f"{uuid.uuid4()}.osm")
 
     with osmium.ForwardReferenceWriter(outfile, ref_file) as writer:
         writer.add_node(DummyNode(2))
diff --git a/test/test_geom.py b/test/test_geom.py
@@ -7,12 +7,8 @@
 import json
 
 import pytest
-
-import osmium
 import osmium.geom
 
-wkbfab = osmium.geom.WKBFactory()
-
 
 @pytest.fixture
 def node_geom(test_data):
diff --git a/test/test_id_tracker.py b/test/test_id_tracker.py
@@ -5,6 +5,7 @@
 # Copyright (C) 2025 Sarah Hoffmann <lonvia@denofr.de> and others.
 # For a full list of authors see the git log.
 import pytest
+import uuid
 
 import osmium
 
@@ -169,7 +170,7 @@ def test_complete_backward_references(tmp_path, depth):
     if depth == 0:
         data_file = osmium.io.FileBuffer(REF_SRC.encode('utf-8'), 'opl')
     else:
-        data_file = tmp_path / 'test.opl'
+        data_file = tmp_path / f"{uuid.uuid4()}.opl"
         data_file.write_text(REF_SRC)
 
     ids = osmium.IdTracker()
@@ -191,7 +192,7 @@ def test_complete_forward_references(tmp_path, depth):
     if depth == 0:
         data_file = osmium.io.FileBuffer(REF_SRC.encode('utf-8'), 'opl')
     else:
-        data_file = tmp_path / 'test.opl'
+        data_file = tmp_path / f"{uuid.uuid4()}.opl"
         data_file.write_text(REF_SRC)
 
     ids = osmium.IdTracker()
diff --git a/test/test_index_location.py b/test/test_index_location.py
@@ -14,14 +14,10 @@ def test_list_types():
     assert ml
 
 
-@pytest.fixture
-def table():
-    return osmium.index.create_map("flex_mem")
-
-
 @pytest.mark.parametrize('use_get', [True, False])
 @pytest.mark.parametrize('use_set', [True, False])
-def test_set_get(table, use_set, use_get):
+def test_set_get(use_set, use_get):
+    table = osmium.index.create_map("flex_mem")
     if use_set:
         table.set(4, osmium.osm.Location(3.4, -5.6))
     else:
@@ -34,33 +30,39 @@ def test_set_get(table, use_set, use_get):
     assert loc.lat == pytest.approx(-5.6)
 
 
-def test_get_unset(table):
+def test_get_unset():
+    table = osmium.index.create_map("flex_mem")
     with pytest.raises(KeyError):
         table.get(56)
 
 
-def test_array_get_unset(table):
+def test_array_get_unset():
+    table = osmium.index.create_map("flex_mem")
     with pytest.raises(KeyError):
         table[56]
 
 
-def test_set_negative(table):
+def test_set_negative():
+    table = osmium.index.create_map("flex_mem")
     with pytest.raises(TypeError):
         table.set(-4, osmium.osm.Location(3.4, -5.6))
 
 
-def test_array_set_negative(table):
+def test_array_set_negative():
+    table = osmium.index.create_map("flex_mem")
     with pytest.raises(TypeError):
         table[-4] = osmium.osm.Location(3.4, -5.6)
 
 
-def test_used_memory(table):
+def test_used_memory():
+    table = osmium.index.create_map("flex_mem")
     table.set(4, osmium.osm.Location(3.4, -5.6))
 
     assert table.used_memory() > 0
 
 
-def test_clear(table):
+def test_clear():
+    table = osmium.index.create_map("flex_mem")
     table.set(593, osmium.osm.Location(0.35, 45.3))
     table.get(593)
     table.clear()
diff --git a/test/test_io.py b/test/test_io.py
@@ -5,6 +5,7 @@
 # Copyright (C) 2025 Sarah Hoffmann <lonvia@denofr.de> and others.
 # For a full list of authors see the git log.
 import pytest
+import uuid
 
 import osmium
 from helpers import CountingHandler
@@ -23,7 +24,7 @@ def _run_file(fn):
 
 @pytest.mark.parametrize('as_string', [True, False])
 def test_file_simple(tmp_path, as_string):
-    fn = tmp_path / 'text.opl'
+    fn = tmp_path / f"{uuid.uuid4()}.opl"
     fn.write_text('n1')
 
     if as_string:
@@ -36,7 +37,7 @@ def test_file_simple(tmp_path, as_string):
 
 @pytest.mark.parametrize('as_string', [True, False])
 def test_file_with_format(tmp_path, as_string):
-    fn = tmp_path / 'text.txt'
+    fn = tmp_path / f"{uuid.uuid4()}.txt"
     fn.write_text('n1')
 
     if as_string:
@@ -81,7 +82,7 @@ def test_broken_timestamp(test_data):
 
 @pytest.mark.parametrize('as_string', [True, False])
 def test_file_header(tmp_path, as_string):
-    fn = tmp_path / 'empty.xml'
+    fn = tmp_path / f"{uuid.uuid4()}.xml"
     fn.write_text("""<?xml version='1.0' encoding='UTF-8'?>
     <osm version="0.6" generator="test-pyosmium" timestamp="2014-08-26T20:22:02Z">
          <bounds minlat="-90" minlon="-180" maxlat="90" maxlon="180"/>
diff --git a/test/test_pyosmium_get_changes.py b/test/test_pyosmium_get_changes.py
@@ -8,6 +8,7 @@
 """
 from pathlib import Path
 from textwrap import dedent
+import uuid
 
 import pytest
 import osmium.replication.server
@@ -57,13 +58,13 @@ def test_init_date(self, capsys, httpserver):
         assert output == '-1'
 
     def test_init_to_file(self, tmp_path, httpserver):
-        fname = tmp_path / 'db.seq'
+        fname = tmp_path / f"{uuid.uuid4()}.seq"
 
         assert 0 == self.main(httpserver, '-I', '453', '-f', str(fname))
         assert fname.read_text() == '453'
 
     def test_init_from_seq_file(self, tmp_path, httpserver):
-        fname = tmp_path / 'db.seq'
+        fname = tmp_path / f"{uuid.uuid4()}.seq"
         fname.write_text('453')
 
         assert 0 == self.main(httpserver, '-f', str(fname))
@@ -91,7 +92,7 @@ def test_init_date_with_cookie(self, capsys, tmp_path, httpserver):
         assert output == '-1'
 
     def test_get_simple_update(self, tmp_path, httpserver):
-        outfile = tmp_path / 'outfile.opl'
+        outfile = tmp_path / f"{uuid.uuid4()}.opl"
 
         httpserver.expect_request('/state.txt').respond_with_data(dedent("""\
                     sequenceNumber=454
diff --git a/test/test_replication.py b/test/test_replication.py
@@ -7,6 +7,7 @@
 import logging
 import time
 from textwrap import dedent
+import uuid
 
 import pytest
 
@@ -17,6 +18,8 @@
 import osmium.replication.server as rserv
 import osmium.replication
 
+pytestmark = [pytest.mark.thread_unsafe, pytest.mark.iterations(1)]
+
 
 @pytest.mark.parametrize("inp,outp", [
         (None,      'https://text.org/state.txt'),
@@ -45,7 +48,7 @@ def test_get_diff_url(inp, outp):
 
 
 def test_get_newest_change_from_file(tmp_path):
-    fn = tmp_path / 'change.opl'
+    fn = tmp_path / f"{uuid.uuid4()}.opl"
     fn.write_text('n6365 v1 c63965061 t2018-10-29T03:56:07Z i8369524 ux x1 y7')
 
     val = osmium.replication.newest_change_from_file(str(fn))
diff --git a/test/test_writer.py b/test/test_writer.py
