hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-16 15:47:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

bdd: directly call utility scripts in lib

Browse Source 
This removes the dependency on php-symfony-dotenv for the tests.
This commit is contained in:
Sarah Hoffmann
2021-01-14 18:19:22 +01:00
parent 9348fc5e15
commit 2f73bb3643
5 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
test/bdd/steps/steps_api_queries.py
View File

@@ -59,7 +59,7 @@ def query_cmd(context, query, dups):
""" Query directly via PHP script.
"""
cmd = ['/usr/bin/env', 'php']
cmd.append(os.path.join(context.nominatim.build_dir, 'utils', 'query.php'))
cmd.append(context.nominatim.src_dir / 'lib' / 'admin' / 'query.php')
if query:
cmd.extend(['--search', query])
# add more parameters in table form
@@ -72,7 +72,8 @@ def query_cmd(context, query, dups):
if dups:
cmd.extend(('--dedupe', '0'))
outp, err = run_script(cmd, cwd=context.nominatim.build_dir)
outp, err = run_script(cmd, cwd=context.nominatim.website_dir.name,
env=context.nominatim.test_env)
context.response = SearchResponse(outp, 'json')