ignore failure to get replication date

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

diff --git a/test/python/test_cli.py b/test/python/test_cli.py
index 9130ac686ba4d4cb2996735441819dd4206a9917..0c0a689e28b9f99a5897332babd711d9f7cacfa5 100644 (file)
--- a/test/python/test_cli.py
+++ b/test/python/test_cli.py
@@ -88,7 +88,7 @@ def test_admin_command_legacy(monkeypatch, params):
     assert mock_run_legacy.called == 1
 
 @pytest.mark.parametrize("func, params", [('analyse_indexing', ('--analyse-indexing', ))])
     assert mock_run_legacy.called == 1
 
 @pytest.mark.parametrize("func, params", [('analyse_indexing', ('--analyse-indexing', ))])

-def test_admin_command_tool(monkeypatch, func, params):
+def test_admin_command_tool(temp_db, monkeypatch, func, params):

     mock = MockParamCapture()
     monkeypatch.setattr(nominatim.tools.admin, func, mock)
 
     mock = MockParamCapture()
     monkeypatch.setattr(nominatim.tools.admin, func, mock)
 


@@ -186,17 +186,15 @@ def test_replication_update_bad_interval_for_geofabrik(monkeypatch, temp_db):
     assert call_nominatim('replication') == 1
 
 
     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", [nominatim.tools.replication.UpdateState.UP_TO_DATE,
+                                   nominatim.tools.replication.UpdateState.NO_CHANGES])

 def test_replication_update_once_no_index(monkeypatch, temp_db, temp_db_conn,
 def test_replication_update_once_no_index(monkeypatch, temp_db, temp_db_conn,

-                                          status_table, state, retval):
+                                          status_table, state):

     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)
 
     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')
+    assert 0 == call_nominatim('replication', '--once', '--no-index')

 
 
 def test_replication_update_continuous(monkeypatch, temp_db_conn, status_table):
 
 
 def test_replication_update_continuous(monkeypatch, temp_db_conn, status_table):