osm-search/Nominatim
1
1
Fork 0
mirror of https://github.com/osm-search/Nominatim.git synced 2024-11-27 00:49:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

bdd: fix faking HTTP headers for python web frameworks

Browse Source
This commit is contained in:
Sarah Hoffmann 2023-06-21 11:33:42 +02:00
parent 3a21999a17
commit 0d338fa4c0
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nominatim/api/v1/helpers.py
View File

@ -83,7 +83,7 @@ def extend_query_parts(queryparts: Dict[str, Any], details: Dict[str, Any],
if parsed.countries: if parsed.countries:
queryparts['countrycodes'] = ','.join(parsed.countries) queryparts['countrycodes'] = ','.join(parsed.countries)
queryparts['exclude_place_ids'] = \ queryparts['exclude_place_ids'] = \
','.join(chain(excluded, map(str, parsed.excluded))) ','.join(chain(excluded, map(str, (e for e in parsed.excluded if e > 0))))
if parsed.viewbox: if parsed.viewbox:
queryparts['viewbox'] = ','.join(f"{c:.7g}" for c in parsed.viewbox.coords) queryparts['viewbox'] = ','.join(f"{c:.7g}" for c in parsed.viewbox.coords)
if parsed.bounded_viewbox: if parsed.bounded_viewbox:

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

@ -111,7 +111,8 @@ def send_api_query_php(endpoint, params, context):
LOG.debug("Environment:" + json.dumps(env, sort_keys=True, indent=2)) LOG.debug("Environment:" + json.dumps(env, sort_keys=True, indent=2))
if hasattr(context, 'http_headers'): if hasattr(context, 'http_headers'):
env.update(context.http_headers) for k, v in context.http_headers.items():
env['HTTP_' + k.upper().replace('-', '_')] = v
cmd = ['/usr/bin/env', 'php-cgi', '-f'] cmd = ['/usr/bin/env', 'php-cgi', '-f']
if context.nominatim.code_coverage_path: if context.nominatim.code_coverage_path:
@ -148,8 +149,7 @@ def add_http_header(context):
context.http_headers = {} context.http_headers = {}
for h in context.table.headings: for h in context.table.headings:
envvar = 'HTTP_' + h.upper().replace('-', '_') context.http_headers[h] = context.table[0][h]
context.http_headers[envvar] = context.table[0][h]
@when(u'sending (?P<fmt>\S+ )?search query "(?P<query>.*)"(?P<addr> with address)?') @when(u'sending (?P<fmt>\S+ )?search query "(?P<query>.*)"(?P<addr> with address)?')