Revert "increase splitting for large geometries"

[nominatim.git] / test / python / test_cli.py

diff --git a/test/python/test_cli.py b/test/python/test_cli.py
index fc2454cd219a3f85edf14b3c2eac7c13f7f851b6..cde84759b0f6fa89d322222c50355732cbcf40a5 100644 (file)
--- a/test/python/test_cli.py
+++ b/test/python/test_cli.py
@@ -5,6 +5,7 @@ These tests just check that the various command line parameters route to the
 correct functionionality. They use a lot of monkeypatching to avoid executing
 the actual functions.
 """
 correct functionionality. They use a lot of monkeypatching to avoid executing
 the actual functions.
 """

+import datetime as dt

 import psycopg2
 import pytest
 import time
 import psycopg2
 import pytest
 import time


@@ -13,6 +14,8 @@ import nominatim.cli
 import nominatim.indexer.indexer
 import nominatim.tools.refresh
 import nominatim.tools.replication
 import nominatim.indexer.indexer
 import nominatim.tools.refresh
 import nominatim.tools.replication

+from nominatim.errors import UsageError
+from nominatim.db import status

 
 def call_nominatim(*args):
     return nominatim.cli.nominatim(module_dir='build/module',
 
 def call_nominatim(*args):
     return nominatim.cli.nominatim(module_dir='build/module',


@@ -150,30 +153,31 @@ def test_replication_command(monkeypatch, temp_db, params, func):
 def test_replication_update_bad_interval(monkeypatch, temp_db):
     monkeypatch.setenv('NOMINATIM_REPLICATION_UPDATE_INTERVAL', 'xx')
 
 def test_replication_update_bad_interval(monkeypatch, temp_db):
     monkeypatch.setenv('NOMINATIM_REPLICATION_UPDATE_INTERVAL', 'xx')
 

-    with pytest.raises(ValueError):
-        call_nominatim('replication')
+    assert call_nominatim('replication') == 1

 
 
 def test_replication_update_bad_interval_for_geofabrik(monkeypatch, temp_db):
     monkeypatch.setenv('NOMINATIM_REPLICATION_URL',
                        'https://download.geofabrik.de/europe/ireland-and-northern-ireland-updates')
 
 
 
 def test_replication_update_bad_interval_for_geofabrik(monkeypatch, temp_db):
     monkeypatch.setenv('NOMINATIM_REPLICATION_URL',
                        'https://download.geofabrik.de/europe/ireland-and-northern-ireland-updates')
 

-    with pytest.raises(RuntimeError, match='Invalid replication.*'):
-        call_nominatim('replication')
+    assert call_nominatim('replication') == 1

 
 
 @pytest.mark.parametrize("state, retval", [
                          (nominatim.tools.replication.UpdateState.UP_TO_DATE, 0),
                          (nominatim.tools.replication.UpdateState.NO_CHANGES, 3)
                          ])
 
 
 @pytest.mark.parametrize("state, retval", [
                          (nominatim.tools.replication.UpdateState.UP_TO_DATE, 0),
                          (nominatim.tools.replication.UpdateState.NO_CHANGES, 3)
                          ])

-def test_replication_update_once_no_index(monkeypatch, temp_db, status_table, state, retval):
+def test_replication_update_once_no_index(monkeypatch, temp_db, temp_db_conn,
+                                          status_table, state, retval):
+    status.set_status(temp_db_conn, date=dt.datetime.now(dt.timezone.utc), seq=1)

     func_mock = MockParamCapture(retval=state)
     monkeypatch.setattr(nominatim.tools.replication, 'update', func_mock)
 
     assert retval == call_nominatim('replication', '--once', '--no-index')
 
 
     func_mock = MockParamCapture(retval=state)
     monkeypatch.setattr(nominatim.tools.replication, 'update', func_mock)
 
     assert retval == call_nominatim('replication', '--once', '--no-index')
 
 

-def test_replication_update_continuous(monkeypatch, status_table):
+def test_replication_update_continuous(monkeypatch, temp_db_conn, status_table):
+    status.set_status(temp_db_conn, date=dt.datetime.now(dt.timezone.utc), seq=1)

     states = [nominatim.tools.replication.UpdateState.UP_TO_DATE,
               nominatim.tools.replication.UpdateState.UP_TO_DATE]
     monkeypatch.setattr(nominatim.tools.replication, 'update',
     states = [nominatim.tools.replication.UpdateState.UP_TO_DATE,
               nominatim.tools.replication.UpdateState.UP_TO_DATE]
     monkeypatch.setattr(nominatim.tools.replication, 'update',


@@ -189,7 +193,8 @@ def test_replication_update_continuous(monkeypatch, status_table):
     assert index_mock.called == 4
 
 
     assert index_mock.called == 4
 
 

-def test_replication_update_continuous_no_change(monkeypatch, status_table):
+def test_replication_update_continuous_no_change(monkeypatch, temp_db_conn, status_table):
+    status.set_status(temp_db_conn, date=dt.datetime.now(dt.timezone.utc), seq=1)

     states = [nominatim.tools.replication.UpdateState.NO_CHANGES,
               nominatim.tools.replication.UpdateState.UP_TO_DATE]
     monkeypatch.setattr(nominatim.tools.replication, 'update',
     states = [nominatim.tools.replication.UpdateState.NO_CHANGES,
               nominatim.tools.replication.UpdateState.UP_TO_DATE]
     monkeypatch.setattr(nominatim.tools.replication, 'update',