improve deadlock detection for various versions of psycopg2

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

diff --git a/test/python/test_cli.py b/test/python/test_cli.py
index e1df94785f907186c43d509e652dc57a98273ced..aa6a5c7fbec9e4fc86a8a6582ba4f3620e01e580 100644 (file)
--- a/test/python/test_cli.py
+++ b/test/python/test_cli.py
@@ -15,9 +15,11 @@ import nominatim.clicmd.api
 import nominatim.clicmd.refresh
 import nominatim.clicmd.admin
 import nominatim.indexer.indexer
+import nominatim.tools.admin
+import nominatim.tools.check_database
+import nominatim.tools.freeze
 import nominatim.tools.refresh
 import nominatim.tools.replication
-import nominatim.tools.freeze
 from nominatim.errors import UsageError
 from nominatim.db import status
 
@@ -95,8 +97,7 @@ def test_freeze_command(mock_func_factory, temp_db):
 
 @pytest.mark.parametrize("params", [('--warm', ),
                                     ('--warm', '--reverse-only'),
-                                    ('--warm', '--search-only'),
-                                    ('--check-database', )])
+                                    ('--warm', '--search-only')])
 def test_admin_command_legacy(mock_func_factory, params):
     mock_run_legacy = mock_func_factory(nominatim.clicmd.admin, 'run_legacy_script')
 
@@ -104,6 +105,7 @@ def test_admin_command_legacy(mock_func_factory, params):
 
     assert mock_run_legacy.called == 1
 
+
 @pytest.mark.parametrize("func, params", [('analyse_indexing', ('--analyse-indexing', ))])
 def test_admin_command_tool(temp_db, mock_func_factory, func, params):
     mock = mock_func_factory(nominatim.tools.admin, func)
@@ -111,6 +113,14 @@ def test_admin_command_tool(temp_db, mock_func_factory, func, params):
     assert 0 == call_nominatim('admin', *params)
     assert mock.called == 1
 
+
+def test_admin_command_check_database(mock_func_factory):
+    mock = mock_func_factory(nominatim.tools.check_database, 'check_database')
+
+    assert 0 == call_nominatim('admin', '--check-database')
+    assert mock.called == 1
+
+
 @pytest.mark.parametrize("name,oid", [('file', 'foo.osm'), ('diff', 'foo.osc'),
                                       ('node', 12), ('way', 8), ('relation', 32)])
 def test_add_data_command(mock_run_legacy, name, oid):
@@ -139,7 +149,6 @@ def test_index_command(mock_func_factory, temp_db_cursor, params, do_bnds, do_ra
 @pytest.mark.parametrize("command,params", [
                          ('wiki-data', ('setup.php', '--import-wikipedia-articles')),
                          ('importance', ('update.php', '--recompute-importance')),
-                         ('website', ('setup.php', '--setup-website')),
                          ])
 def test_refresh_legacy_command(mock_func_factory, temp_db, command, params):
     mock_run_legacy = mock_func_factory(nominatim.clicmd.refresh, 'run_legacy_script')
@@ -155,6 +164,7 @@ def test_refresh_legacy_command(mock_func_factory, temp_db, command, params):
                          ('word-counts', 'recompute_word_counts'),
                          ('address-levels', 'load_address_levels_from_file'),
                          ('functions', 'create_functions'),
+                         ('website', 'setup_website'),
                          ])
 def test_refresh_command(mock_func_factory, temp_db, command, func):
     func_mock = mock_func_factory(nominatim.tools.refresh, func)