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 10e57f8b7fbbaf83f3b07b9fb472331fb7d95401..aa6a5c7fbec9e4fc86a8a6582ba4f3620e01e580 100644 (file)
--- a/test/python/test_cli.py
+++ b/test/python/test_cli.py
@@ -149,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')),
 @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')
                          ])
 def test_refresh_legacy_command(mock_func_factory, temp_db, command, params):
     mock_run_legacy = mock_func_factory(nominatim.clicmd.refresh, 'run_legacy_script')


@@ -165,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'),
                          ('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)
                          ])
 def test_refresh_command(mock_func_factory, temp_db, command, func):
     func_mock = mock_func_factory(nominatim.tools.refresh, func)