X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/c9035594152ac7caa5fd06b1334b031a39ce5ab3..2bab0ca060ff224091b20a0ac808a3febaba04b1:/test/python/tools/test_replication.py diff --git a/test/python/tools/test_replication.py b/test/python/tools/test_replication.py index 7a7340ae..4cd53ae3 100644 --- a/test/python/tools/test_replication.py +++ b/test/python/tools/test_replication.py @@ -1,8 +1,8 @@ -# SPDX-License-Identifier: GPL-2.0-only +# SPDX-License-Identifier: GPL-3.0-or-later # # This file is part of Nominatim. (https://nominatim.org) # -# Copyright (C) 2022 by the Nominatim developer community. +# Copyright (C) 2024 by the Nominatim developer community. # For a full list of authors see the git log. """ Tests for replication functionality. @@ -13,9 +13,9 @@ import time import pytest from osmium.replication.server import OsmosisState -import nominatim.tools.replication -import nominatim.db.status as status -from nominatim.errors import UsageError +import nominatim_db.tools.replication +import nominatim_core.db.status as status +from nominatim_core.errors import UsageError OSM_NODE_DATA = """\ @@ -33,21 +33,21 @@ def setup_status_table(status_table): def test_init_replication_bad_base_url(monkeypatch, place_row, temp_db_conn): place_row(osm_type='N', osm_id=100) - monkeypatch.setattr(nominatim.db.status, "get_url", lambda u: OSM_NODE_DATA) + monkeypatch.setattr(status, "get_url", lambda u: OSM_NODE_DATA) with pytest.raises(UsageError, match="Failed to reach replication service"): - nominatim.tools.replication.init_replication(temp_db_conn, 'https://test.io') + nominatim_db.tools.replication.init_replication(temp_db_conn, 'https://test.io') def test_init_replication_success(monkeypatch, place_row, temp_db_conn, temp_db_cursor): place_row(osm_type='N', osm_id=100) - monkeypatch.setattr(nominatim.db.status, "get_url", lambda u: OSM_NODE_DATA) - monkeypatch.setattr(nominatim.tools.replication.ReplicationServer, + monkeypatch.setattr(status, "get_url", lambda u: OSM_NODE_DATA) + monkeypatch.setattr(nominatim_db.tools.replication.ReplicationServer, "timestamp_to_sequence", lambda self, date: 234) - nominatim.tools.replication.init_replication(temp_db_conn, 'https://test.io') + 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) @@ -59,22 +59,22 @@ def test_init_replication_success(monkeypatch, place_row, temp_db_conn, temp_db_ ### checking for updates def test_check_for_updates_empty_status_table(temp_db_conn): - assert nominatim.tools.replication.check_for_updates(temp_db_conn, 'https://test.io') == 254 + assert nominatim_db.tools.replication.check_for_updates(temp_db_conn, 'https://test.io') == 254 def test_check_for_updates_seq_not_set(temp_db_conn): status.set_status(temp_db_conn, dt.datetime.now(dt.timezone.utc)) - assert nominatim.tools.replication.check_for_updates(temp_db_conn, 'https://test.io') == 254 + assert nominatim_db.tools.replication.check_for_updates(temp_db_conn, 'https://test.io') == 254 def test_check_for_updates_no_state(monkeypatch, temp_db_conn): status.set_status(temp_db_conn, dt.datetime.now(dt.timezone.utc), seq=345) - monkeypatch.setattr(nominatim.tools.replication.ReplicationServer, + monkeypatch.setattr(nominatim_db.tools.replication.ReplicationServer, "get_state_info", lambda self: None) - assert nominatim.tools.replication.check_for_updates(temp_db_conn, 'https://test.io') == 253 + assert nominatim_db.tools.replication.check_for_updates(temp_db_conn, 'https://test.io') == 253 @pytest.mark.parametrize("server_sequence,result", [(344, 2), (345, 2), (346, 0)]) @@ -83,11 +83,11 @@ def test_check_for_updates_no_new_data(monkeypatch, temp_db_conn, date = dt.datetime.now(dt.timezone.utc) status.set_status(temp_db_conn, date, seq=345) - monkeypatch.setattr(nominatim.tools.replication.ReplicationServer, + monkeypatch.setattr(nominatim_db.tools.replication.ReplicationServer, "get_state_info", lambda self: OsmosisState(server_sequence, date)) - assert nominatim.tools.replication.check_for_updates(temp_db_conn, 'https://test.io') == result + assert nominatim_db.tools.replication.check_for_updates(temp_db_conn, 'https://test.io') == result ### updating @@ -102,29 +102,29 @@ def update_options(tmpdir): def test_update_empty_status_table(dsn): with pytest.raises(UsageError): - nominatim.tools.replication.update(dsn, {}) + nominatim_db.tools.replication.update(dsn, {}) 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.tools.replication.update(dsn, dict(indexed_only=True)) \ - == nominatim.tools.replication.UpdateState.MORE_PENDING + assert nominatim_db.tools.replication.update(dsn, dict(indexed_only=True)) \ + == nominatim_db.tools.replication.UpdateState.MORE_PENDING def test_update_no_data_no_sleep(monkeypatch, temp_db_conn, dsn, update_options): date = dt.datetime.now(dt.timezone.utc) - dt.timedelta(days=1) status.set_status(temp_db_conn, date, seq=34) - monkeypatch.setattr(nominatim.tools.replication.ReplicationServer, + monkeypatch.setattr(nominatim_db.tools.replication.ReplicationServer, "apply_diffs", lambda *args, **kwargs: None) sleeptime = [] monkeypatch.setattr(time, 'sleep', sleeptime.append) - assert nominatim.tools.replication.update(dsn, update_options) \ - == nominatim.tools.replication.UpdateState.NO_CHANGES + assert nominatim_db.tools.replication.update(dsn, update_options) \ + == nominatim_db.tools.replication.UpdateState.NO_CHANGES assert not sleeptime @@ -133,15 +133,15 @@ def test_update_no_data_sleep(monkeypatch, temp_db_conn, dsn, update_options): date = dt.datetime.now(dt.timezone.utc) - dt.timedelta(minutes=30) status.set_status(temp_db_conn, date, seq=34) - monkeypatch.setattr(nominatim.tools.replication.ReplicationServer, + monkeypatch.setattr(nominatim_db.tools.replication.ReplicationServer, "apply_diffs", lambda *args, **kwargs: None) sleeptime = [] monkeypatch.setattr(time, 'sleep', sleeptime.append) - assert nominatim.tools.replication.update(dsn, update_options) \ - == nominatim.tools.replication.UpdateState.NO_CHANGES + assert nominatim_db.tools.replication.update(dsn, update_options) \ + == nominatim_db.tools.replication.UpdateState.NO_CHANGES assert len(sleeptime) == 1 assert sleeptime[0] < 3600