X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/c314a3092c5b51c7782015f6fa9ac093b46fa174..7f11de0db9ecbb2a8f7551815285d7553747a96e:/test/python/cli/test_cli.py

diff --git a/test/python/cli/test_cli.py b/test/python/cli/test_cli.py
index 688afb7c..2831f84f 100644
--- a/test/python/cli/test_cli.py
+++ b/test/python/cli/test_cli.py
@@ -17,6 +17,7 @@ import pytest
 import nominatim_db.indexer.indexer
 import nominatim_db.tools.add_osm_data
 import nominatim_db.tools.freeze
+import nominatim_db.tools.tiger_data
 
 
 def test_cli_help(cli_call, capsys):
@@ -35,30 +36,6 @@ def test_cli_version(cli_call, capsys):
     captured = capsys.readouterr()
     assert captured.out.startswith('Nominatim version')
 
-@pytest.mark.parametrize("name,oid", [('file', 'foo.osm'), ('diff', 'foo.osc')])
-def test_cli_add_data_file_command(cli_call, mock_func_factory, name, oid):
-    mock_run_legacy = mock_func_factory(nominatim_db.tools.add_osm_data, 'add_data_from_file')
-    assert cli_call('add-data', '--' + name, str(oid)) == 0
-
-    assert mock_run_legacy.called == 1
-
-
-@pytest.mark.parametrize("name,oid", [('node', 12), ('way', 8), ('relation', 32)])
-def test_cli_add_data_object_command(cli_call, mock_func_factory, name, oid):
-    mock_run_legacy = mock_func_factory(nominatim_db.tools.add_osm_data, 'add_osm_object')
-    assert cli_call('add-data', '--' + name, str(oid)) == 0
-
-    assert mock_run_legacy.called == 1
-
-
-
-def test_cli_add_data_tiger_data(cli_call, cli_tokenizer_mock, mock_func_factory):
-    mock = mock_func_factory(nominatim_db.tools.tiger_data, 'add_tiger_data')
-
-    assert cli_call('add-data', '--tiger-data', 'somewhere') == 0
-
-    assert mock.called == 1
-
 
 def test_cli_serve_php(cli_call, mock_func_factory):
     func = mock_func_factory(nominatim_db.cli, 'run_php_server')
@@ -68,46 +45,40 @@ def test_cli_serve_php(cli_call, mock_func_factory):
     assert func.called == 1
 
 
-def test_cli_serve_starlette_custom_server(cli_call, mock_func_factory):
-    pytest.importorskip("starlette")
-    mod = pytest.importorskip("uvicorn")
-    func = mock_func_factory(mod, "run")
 
-    cli_call('serve', '--engine', 'starlette', '--server', 'foobar:4545') == 0
+class TestCliWithDb:
 
-    assert func.called == 1
-    assert func.last_kwargs['host'] == 'foobar'
-    assert func.last_kwargs['port'] == 4545
+    @pytest.fixture(autouse=True)
+    def setup_cli_call(self, cli_call, temp_db, cli_tokenizer_mock, table_factory):
+        self.call_nominatim = cli_call
+        self.tokenizer_mock = cli_tokenizer_mock
+        # Make sure tools.freeze.is_frozen doesn't report database as frozen. Monkeypatching failed
+        table_factory('place')
 
 
-def test_cli_serve_starlette_custom_server_bad_port(cli_call, mock_func_factory):
-    pytest.importorskip("starlette")
-    mod = pytest.importorskip("uvicorn")
-    func = mock_func_factory(mod, "run")
+    @pytest.mark.parametrize("name,oid", [('file', 'foo.osm'), ('diff', 'foo.osc')])
+    def test_cli_add_data_file_command(self, cli_call, mock_func_factory, name, oid):
+        mock_run_legacy = mock_func_factory(nominatim_db.tools.add_osm_data, 'add_data_from_file')
+        assert cli_call('add-data', '--' + name, str(oid)) == 0
 
-    cli_call('serve', '--engine', 'starlette', '--server', 'foobar:45:45') == 1
+        assert mock_run_legacy.called == 1
 
 
-@pytest.mark.parametrize("engine", ['falcon', 'starlette'])
-def test_cli_serve_uvicorn_based(cli_call, engine, mock_func_factory):
-    pytest.importorskip(engine)
-    mod = pytest.importorskip("uvicorn")
-    func = mock_func_factory(mod, "run")
+    @pytest.mark.parametrize("name,oid", [('node', 12), ('way', 8), ('relation', 32)])
+    def test_cli_add_data_object_command(self, cli_call, mock_func_factory, name, oid):
+        mock_run_legacy = mock_func_factory(nominatim_db.tools.add_osm_data, 'add_osm_object')
+        assert cli_call('add-data', '--' + name, str(oid)) == 0
 
-    cli_call('serve', '--engine', engine) == 0
+        assert mock_run_legacy.called == 1
 
-    assert func.called == 1
-    assert func.last_kwargs['host'] == '127.0.0.1'
-    assert func.last_kwargs['port'] == 8088
 
 
-class TestCliWithDb:
+    def test_cli_add_data_tiger_data(self, cli_call, cli_tokenizer_mock, async_mock_func_factory):
+        mock = async_mock_func_factory(nominatim_db.tools.tiger_data, 'add_tiger_data')
 
-    @pytest.fixture(autouse=True)
-    def setup_cli_call(self, cli_call, temp_db, cli_tokenizer_mock):
-        self.call_nominatim = cli_call
-        self.tokenizer_mock = cli_tokenizer_mock
+        assert cli_call('add-data', '--tiger-data', 'somewhere') == 0
 
+        assert mock.called == 1
 
     def test_freeze_command(self, mock_func_factory):
         mock_drop = mock_func_factory(nominatim_db.tools.freeze, 'drop_update_tables')
@@ -120,16 +91,19 @@ class TestCliWithDb:
 
 
     @pytest.mark.parametrize("params,do_bnds,do_ranks", [
-                              ([], 1, 1),
-                              (['--boundaries-only'], 1, 0),
-                              (['--no-boundaries'], 0, 1),
+                              ([], 2, 2),
+                              (['--boundaries-only'], 2, 0),
+                              (['--no-boundaries'], 0, 2),
                               (['--boundaries-only', '--no-boundaries'], 0, 0)])
-    def test_index_command(self, mock_func_factory, table_factory,
+    def test_index_command(self, monkeypatch, async_mock_func_factory, table_factory,
                            params, do_bnds, do_ranks):
         table_factory('import_status', 'indexed bool')
-        bnd_mock = mock_func_factory(nominatim_db.indexer.indexer.Indexer, 'index_boundaries')
-        rank_mock = mock_func_factory(nominatim_db.indexer.indexer.Indexer, 'index_by_rank')
-        postcode_mock = mock_func_factory(nominatim_db.indexer.indexer.Indexer, 'index_postcodes')
+        bnd_mock = async_mock_func_factory(nominatim_db.indexer.indexer.Indexer, 'index_boundaries')
+        rank_mock = async_mock_func_factory(nominatim_db.indexer.indexer.Indexer, 'index_by_rank')
+        postcode_mock = async_mock_func_factory(nominatim_db.indexer.indexer.Indexer, 'index_postcodes')
+
+        monkeypatch.setattr(nominatim_db.indexer.indexer.Indexer, 'has_pending', 
+                            [False, True].pop)
 
         assert self.call_nominatim('index', *params) == 0