also enable flake for tests in github actions

[nominatim.git] / test / python / tools / test_replication.py

diff --git a/test/python/tools/test_replication.py b/test/python/tools/test_replication.py
index 392ea0750b6f50c11c5006e4ef6eb09ceb7763f3..347899bdb0fc4f97c448c0d064ae0638f027f1dc 100644 (file)
--- a/test/python/tools/test_replication.py
+++ b/test/python/tools/test_replication.py
@@ -2,7 +2,7 @@
 #
 # This file is part of Nominatim. (https://nominatim.org)
 #
 #
 # This file is part of Nominatim. (https://nominatim.org)
 #

-# Copyright (C) 2024 by the Nominatim developer community.
+# Copyright (C) 2025 by the Nominatim developer community.

 # For a full list of authors see the git log.
 """
 Tests for replication functionality.
 # For a full list of authors see the git log.
 """
 Tests for replication functionality.


@@ -22,13 +22,15 @@ OSM_NODE_DATA = """\
 <node id="100" visible="true" version="1" changeset="2047" timestamp="2006-01-27T22:09:10Z" user="Foo" uid="111" lat="48.7586670" lon="8.1343060">
 </node>
 </osm>
 <node id="100" visible="true" version="1" changeset="2047" timestamp="2006-01-27T22:09:10Z" user="Foo" uid="111" lat="48.7586670" lon="8.1343060">
 </node>
 </osm>

-"""
+"""  # noqa
+

 
 @pytest.fixture(autouse=True)
 def setup_status_table(status_table):
     pass
 
 
 @pytest.fixture(autouse=True)
 def setup_status_table(status_table):
     pass
 

-### init replication
+
+# init replication

 
 def test_init_replication_bad_base_url(monkeypatch, place_row, temp_db_conn):
     place_row(osm_type='N', osm_id=100)
 
 def test_init_replication_bad_base_url(monkeypatch, place_row, temp_db_conn):
     place_row(osm_type='N', osm_id=100)


@@ -50,13 +52,13 @@ def test_init_replication_success(monkeypatch, place_row, temp_db_conn, temp_db_
     nominatim_db.tools.replication.init_replication(temp_db_conn, 'https://test.io')
 
     expected_date = dt.datetime.strptime('2006-01-27T19:09:10', status.ISODATE_FORMAT)\
     nominatim_db.tools.replication.init_replication(temp_db_conn, 'https://test.io')
 
     expected_date = dt.datetime.strptime('2006-01-27T19:09:10', status.ISODATE_FORMAT)\

-                        .replace(tzinfo=dt.timezone.utc)
+                      .replace(tzinfo=dt.timezone.utc)

 
     assert temp_db_cursor.row_set("SELECT * FROM import_status") \
 
     assert temp_db_cursor.row_set("SELECT * FROM import_status") \

-             == {(expected_date, 234, True)}
+        == {(expected_date, 234, True)}

 
 
 
 

-### checking for updates
+# checking for updates

 
 def test_check_for_updates_empty_status_table(temp_db_conn):
     assert nominatim_db.tools.replication.check_for_updates(temp_db_conn, 'https://test.io') == 254
 
 def test_check_for_updates_empty_status_table(temp_db_conn):
     assert nominatim_db.tools.replication.check_for_updates(temp_db_conn, 'https://test.io') == 254


@@ -87,10 +89,11 @@ def test_check_for_updates_no_new_data(monkeypatch, temp_db_conn,
                         "get_state_info",
                         lambda self: OsmosisState(server_sequence, date))
 
                         "get_state_info",
                         lambda self: OsmosisState(server_sequence, date))
 

-    assert nominatim_db.tools.replication.check_for_updates(temp_db_conn, 'https://test.io') == result
+    assert result == \
+        nominatim_db.tools.replication.check_for_updates(temp_db_conn, 'https://test.io')

 
 
 
 

-### updating
+# updating

 
 @pytest.fixture
 def update_options(tmpdir):
 
 @pytest.fixture
 def update_options(tmpdir):


@@ -100,6 +103,7 @@ def update_options(tmpdir):
                 import_file=tmpdir / 'foo.osm',
                 max_diff_size=1)
 
                 import_file=tmpdir / 'foo.osm',
                 max_diff_size=1)
 

+

 def test_update_empty_status_table(dsn):
     with pytest.raises(UsageError):
         nominatim_db.tools.replication.update(dsn, {})
 def test_update_empty_status_table(dsn):
     with pytest.raises(UsageError):
         nominatim_db.tools.replication.update(dsn, {})


@@ -109,7 +113,7 @@ def test_update_already_indexed(temp_db_conn, dsn):
     status.set_status(temp_db_conn, dt.datetime.now(dt.timezone.utc), seq=34, indexed=False)
 
     assert nominatim_db.tools.replication.update(dsn, dict(indexed_only=True)) \
     status.set_status(temp_db_conn, dt.datetime.now(dt.timezone.utc), seq=34, indexed=False)
 
     assert nominatim_db.tools.replication.update(dsn, dict(indexed_only=True)) \

-             == nominatim_db.tools.replication.UpdateState.MORE_PENDING
+        == nominatim_db.tools.replication.UpdateState.MORE_PENDING

 
 
 def test_update_no_data_no_sleep(monkeypatch, temp_db_conn, dsn, update_options):
 
 
 def test_update_no_data_no_sleep(monkeypatch, temp_db_conn, dsn, update_options):


@@ -124,7 +128,7 @@ def test_update_no_data_no_sleep(monkeypatch, temp_db_conn, dsn, update_options)
     monkeypatch.setattr(time, 'sleep', sleeptime.append)
 
     assert nominatim_db.tools.replication.update(dsn, update_options) \
     monkeypatch.setattr(time, 'sleep', sleeptime.append)
 
     assert nominatim_db.tools.replication.update(dsn, update_options) \

-             == nominatim_db.tools.replication.UpdateState.NO_CHANGES
+        == nominatim_db.tools.replication.UpdateState.NO_CHANGES

 
     assert not sleeptime
 
 
     assert not sleeptime
 


@@ -141,7 +145,7 @@ def test_update_no_data_sleep(monkeypatch, temp_db_conn, dsn, update_options):
     monkeypatch.setattr(time, 'sleep', sleeptime.append)
 
     assert nominatim_db.tools.replication.update(dsn, update_options) \
     monkeypatch.setattr(time, 'sleep', sleeptime.append)
 
     assert nominatim_db.tools.replication.update(dsn, update_options) \

-             == nominatim_db.tools.replication.UpdateState.NO_CHANGES
+        == nominatim_db.tools.replication.UpdateState.NO_CHANGES

 
     assert len(sleeptime) == 1
     assert sleeptime[0] < 3600
 
     assert len(sleeptime) == 1
     assert sleeptime[0] < 3600