Merge remote-tracking branch 'upstream/master'

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

diff --git a/test/python/test_cli_replication.py b/test/python/test_cli_replication.py
index dcaeaf25fb8fff283f3228ac0fe2d12d56a99ad5..2dd35c0e532d246546d13e6e65863867644aa14d 100644 (file)
--- a/test/python/test_cli_replication.py
+++ b/test/python/test_cli_replication.py
@@ -53,8 +53,7 @@ def init_status(temp_db_conn, status_table):
 @pytest.fixture
 def index_mock(monkeypatch, tokenizer_mock, init_status):
     mock = MockParamCapture()
 @pytest.fixture
 def index_mock(monkeypatch, tokenizer_mock, init_status):
     mock = MockParamCapture()

-    monkeypatch.setattr(nominatim.indexer.indexer.Indexer, 'index_boundaries', mock)
-    monkeypatch.setattr(nominatim.indexer.indexer.Indexer, 'index_by_rank', mock)
+    monkeypatch.setattr(nominatim.indexer.indexer.Indexer, 'index_full', mock)

 
     return mock
 
 
     return mock
 


@@ -122,7 +121,7 @@ class TestCliReplication:
         with pytest.raises(IndexError):
             self.call_nominatim()
 
         with pytest.raises(IndexError):
             self.call_nominatim()
 

-        assert index_mock.called == 4
+        assert index_mock.called == 2

 
 
     def test_replication_update_continuous_no_change(self, monkeypatch, index_mock):
 
 
     def test_replication_update_continuous_no_change(self, monkeypatch, index_mock):


@@ -137,6 +136,6 @@ class TestCliReplication:
         with pytest.raises(IndexError):
             self.call_nominatim()
 
         with pytest.raises(IndexError):
             self.call_nominatim()
 

-        assert index_mock.called == 2
+        assert index_mock.called == 1

         assert sleep_mock.called == 1
         assert sleep_mock.last_args[0] == 60
         assert sleep_mock.called == 1
         assert sleep_mock.last_args[0] == 60