Merge remote-tracking branch 'upstream/master'

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

diff --git a/test/python/tools/test_refresh_setup_website.py b/test/python/tools/test_refresh_setup_website.py
index 8946bd1feae1790d3e29242e74ef28d07f3f616e..af3804c91cdd1148357db9e9cf4cf5cf7420ad97 100644 (file)
--- a/test/python/tools/test_refresh_setup_website.py
+++ b/test/python/tools/test_refresh_setup_website.py
@@ -1,3 +1,9 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# This file is part of Nominatim. (https://nominatim.org)
+#
+# Copyright (C) 2022 by the Nominatim developer community.
+# For a full list of authors see the git log.
 """
 Tests for setting up the website scripts.
 """
@@ -22,12 +28,11 @@ def test_script(tmp_path):
 
 
 @pytest.fixture
-def run_website_script(tmp_path, def_config, temp_db_conn):
-    def_config.lib_dir.php = tmp_path / 'php'
-    def_config.project_dir = tmp_path
+def run_website_script(tmp_path, project_env, temp_db_conn):
+    project_env.lib_dir.php = tmp_path / 'php'
 
     def _runner():
-        refresh.setup_website(tmp_path, def_config, temp_db_conn)
+        refresh.setup_website(tmp_path, project_env, temp_db_conn)
 
         proc = subprocess.run(['/usr/bin/env', 'php', '-Cq',
                                tmp_path / 'search.php'], check=False)
@@ -37,6 +42,16 @@ def run_website_script(tmp_path, def_config, temp_db_conn):
     return _runner
 
 
+def test_basedir_created(tmp_path, project_env, temp_db_conn):
+    webdir = tmp_path / 'website'
+
+    assert not webdir.exists()
+
+    refresh.setup_website(webdir, project_env, temp_db_conn)
+
+    assert webdir.exists()
+
+
 @pytest.mark.parametrize("setting,retval", (('yes', 10), ('no', 20)))
 def test_setup_website_check_bool(monkeypatch, test_script, run_website_script,
                                   setting, retval):
@@ -70,3 +85,13 @@ def test_setup_website_check_str(monkeypatch, test_script, run_website_script):
     test_script('exit(CONST_Default_Language === "ffde 2" ? 10 : 20);')
 
     assert run_website_script() == 10
+
+
+def test_relative_log_file(project_env, monkeypatch, test_script, run_website_script):
+    monkeypatch.setenv('NOMINATIM_LOG_FILE', 'access.log')
+
+    expected_file = str(project_env.project_dir / 'access.log')
+    test_script(f'exit(CONST_Log_File === "{expected_file}" ? 10 : 20);')
+
+    assert run_website_script() == 10
+