Merge pull request #3519 from lonvia/api-error-handling

[nominatim.git] / test / python / tools / conftest.py

diff --git a/test/python/tools/conftest.py b/test/python/tools/conftest.py
index 6dd5f2d650b521fd6beba8ebbfd7c98531f6d15e..0098747e52537d97eb33c889fcbb0f600fb2967e 100644 (file)
--- a/test/python/tools/conftest.py
+++ b/test/python/tools/conftest.py
@@ -1,16 +1,29 @@
-# SPDX-License-Identifier: GPL-2.0-only
+# SPDX-License-Identifier: GPL-3.0-or-later

 #
 # This file is part of Nominatim. (https://nominatim.org)
 #
 #
 # This file is part of Nominatim. (https://nominatim.org)
 #

-# Copyright (C) 2022 by the Nominatim developer community.
+# Copyright (C) 2024 by the Nominatim developer community.

 # For a full list of authors see the git log.
 import pytest
 
 @pytest.fixture
 # For a full list of authors see the git log.
 import pytest
 
 @pytest.fixture

-def osm2pgsql_options(temp_db):
-    """ A standard set of options for osm2pgsql.
+def osm2pgsql_options(temp_db, tmp_path):
+    """ A standard set of options for osm2pgsql
+        together with a osm2pgsql mock that just reflects the command line.

     """
     """

-    return dict(osm2pgsql='echo',
+    osm2pgsql_exec = tmp_path / 'osm2pgsql_mock'
+
+    osm2pgsql_exec.write_text("""#!/bin/sh
+
+if [ "$*" = "--version" ]; then
+  >&2 echo "2024-08-09 11:16:23  osm2pgsql version 11.7.2 (11.7.2)"
+else
+  echo "$@"
+fi
+    """)
+    osm2pgsql_exec.chmod(0o777)
+
+    return dict(osm2pgsql=str(osm2pgsql_exec),

                 osm2pgsql_cache=10,
                 osm2pgsql_style='style.file',
                 threads=1,
                 osm2pgsql_cache=10,
                 osm2pgsql_style='style.file',
                 threads=1,