From: Sarah Hoffmann <lonvia@denofr.de>
Date: Thu, 11 Feb 2021 09:01:31 +0000 (+0100)
Subject: always return 0 for updates unless there is an error
X-Git-Tag: v3.7.0~38^2
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/7cc4c53adb6fec50fe9a5f224ec9c702cad66680

always return 0 for updates unless there is an error

This is more in line with previous behavioru than returning
a status code when no updates are available.
---

diff --git a/nominatim/clicmd/replication.py b/nominatim/clicmd/replication.py
index 4852c8b1..2a19e6cd 100644
--- a/nominatim/clicmd/replication.py
+++ b/nominatim/clicmd/replication.py
@@ -154,8 +154,6 @@ class UpdateReplication:
                 LOG.warning("No new changes. Sleeping for %d sec.", recheck_interval)
                 time.sleep(recheck_interval)
 
-        return state.value
-
 
     @staticmethod
     def run(args):
@@ -167,4 +165,5 @@ class UpdateReplication:
         if args.check_for_updates:
             return UpdateReplication._check_for_updates(args)
 
-        return UpdateReplication._update(args)
+        UpdateReplication._update(args)
+        return 0
diff --git a/test/python/test_cli.py b/test/python/test_cli.py
index a8efd356..0c0a689e 100644
--- a/test/python/test_cli.py
+++ b/test/python/test_cli.py
@@ -186,17 +186,15 @@ def test_replication_update_bad_interval_for_geofabrik(monkeypatch, temp_db):
     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,
-                                          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)
 
-    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):