Merge remote-tracking branch 'upstream/master'

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

diff --git a/test/python/test_tools_refresh_setup_website.py b/test/python/test_tools_refresh_setup_website.py
index dc822e3c166051bf6812b75d41fb64703427ae97..8946bd1feae1790d3e29242e74ef28d07f3f616e 100644 (file)
--- a/test/python/test_tools_refresh_setup_website.py
+++ b/test/python/test_tools_refresh_setup_website.py
@@ -1,7 +1,6 @@
 """
 Tests for setting up the website scripts.
 """
 """
 Tests for setting up the website scripts.
 """

-from pathlib import Path

 import subprocess
 
 import pytest
 import subprocess
 
 import pytest


@@ -9,64 +8,65 @@ import pytest
 from nominatim.tools import refresh
 
 @pytest.fixture
 from nominatim.tools import refresh
 
 @pytest.fixture

-def envdir(tmpdir):
-    (tmpdir / 'php').mkdir()
-    (tmpdir / 'php' / 'website').mkdir()
-    return tmpdir
+def test_script(tmp_path):
+    (tmp_path / 'php').mkdir()

 
 

+    website_dir = (tmp_path / 'php' / 'website')
+    website_dir.mkdir()

 
 

-@pytest.fixture
-def test_script(envdir):

     def _create_file(code):
     def _create_file(code):

-        outfile = envdir / 'php' / 'website' / 'search.php'
+        outfile = website_dir / 'reverse-only-search.php'

         outfile.write_text('<?php\n{}\n'.format(code), 'utf-8')
 
     return _create_file
 
 
         outfile.write_text('<?php\n{}\n'.format(code), 'utf-8')
 
     return _create_file
 
 

-def run_website_script(envdir, config):
-    config.lib_dir.php = envdir / 'php'
-    config.project_dir = envdir
-    refresh.setup_website(envdir, config)
+@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 _runner():
+        refresh.setup_website(tmp_path, def_config, temp_db_conn)
+
+        proc = subprocess.run(['/usr/bin/env', 'php', '-Cq',
+                               tmp_path / 'search.php'], check=False)

 
 

-    proc = subprocess.run(['/usr/bin/env', 'php', '-Cq',
-                           envdir / 'search.php'], check=False)
+        return proc.returncode

 
 

-    return proc.returncode
+    return _runner

 
 
 @pytest.mark.parametrize("setting,retval", (('yes', 10), ('no', 20)))
 
 
 @pytest.mark.parametrize("setting,retval", (('yes', 10), ('no', 20)))

-def test_setup_website_check_bool(def_config, monkeypatch, envdir, test_script,
+def test_setup_website_check_bool(monkeypatch, test_script, run_website_script,

                                   setting, retval):
     monkeypatch.setenv('NOMINATIM_CORS_NOACCESSCONTROL', setting)
 
     test_script('exit(CONST_NoAccessControl ? 10 : 20);')
 
                                   setting, retval):
     monkeypatch.setenv('NOMINATIM_CORS_NOACCESSCONTROL', setting)
 
     test_script('exit(CONST_NoAccessControl ? 10 : 20);')
 

-    assert run_website_script(envdir, def_config) == retval
+    assert run_website_script() == retval

 
 
 @pytest.mark.parametrize("setting", (0, 10, 99067))
 
 
 @pytest.mark.parametrize("setting", (0, 10, 99067))

-def test_setup_website_check_int(def_config, monkeypatch, envdir, test_script, setting):
+def test_setup_website_check_int(monkeypatch, test_script, run_website_script, setting):

     monkeypatch.setenv('NOMINATIM_LOOKUP_MAX_COUNT', str(setting))
 
     test_script('exit(CONST_Places_Max_ID_count == {} ? 10 : 20);'.format(setting))
 
     monkeypatch.setenv('NOMINATIM_LOOKUP_MAX_COUNT', str(setting))
 
     test_script('exit(CONST_Places_Max_ID_count == {} ? 10 : 20);'.format(setting))
 

-    assert run_website_script(envdir, def_config) == 10
+    assert run_website_script() == 10

 
 
 
 

-def test_setup_website_check_empty_str(def_config, monkeypatch, envdir, test_script):
+def test_setup_website_check_empty_str(monkeypatch, test_script, run_website_script):

     monkeypatch.setenv('NOMINATIM_DEFAULT_LANGUAGE', '')
 
     test_script('exit(CONST_Default_Language === false ? 10 : 20);')
 
     monkeypatch.setenv('NOMINATIM_DEFAULT_LANGUAGE', '')
 
     test_script('exit(CONST_Default_Language === false ? 10 : 20);')
 

-    assert run_website_script(envdir, def_config) == 10
+    assert run_website_script() == 10

 
 
 
 

-def test_setup_website_check_str(def_config, monkeypatch, envdir, test_script):
+def test_setup_website_check_str(monkeypatch, test_script, run_website_script):

     monkeypatch.setenv('NOMINATIM_DEFAULT_LANGUAGE', 'ffde 2')
 
     test_script('exit(CONST_Default_Language === "ffde 2" ? 10 : 20);')
 
     monkeypatch.setenv('NOMINATIM_DEFAULT_LANGUAGE', 'ffde 2')
 
     test_script('exit(CONST_Default_Language === "ffde 2" ? 10 : 20);')
 

-    assert run_website_script(envdir, def_config) == 10
-
-
+    assert run_website_script() == 10