0001-workflows-handle-bytes-returned-from-geolocation-ser.patch

Frédéric Péters, 27 janvier 2020 15:37

Voir les différences: en ligne côte à côte

Subject: [PATCH] workflows: handle bytes returned from geolocation service
 (#39302)

 tests/test_workflows.py | 14 +++++++-------
 wcs/wf/geolocate.py     |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

         with mock.patch('wcs.wf.geolocate.http_get_page') as http_get_page:
             http_get_page.return_value = (None, 200,
                     json.dumps([{'lat':'48.8337085','lon':'2.3233693'}]), None)
                     force_bytes(json.dumps([{'lat':'48.8337085','lon':'2.3233693'}])), None)
             item.perform(formdata)
             assert 'https://nominatim.entrouvert.org/search' in http_get_page.call_args[0][0]
             assert urlparse.quote('169 rue du chateau, paris') in http_get_page.call_args[0][0]
-...
         pub.site_options.set('options', 'nominatim_key', 'KEY')
         with mock.patch('wcs.wf.geolocate.http_get_page') as http_get_page:
             http_get_page.return_value = (None, 200,
                     json.dumps([{'lat':'48.8337085', 'lon':'2.3233693'}]), None)
                     force_bytes(json.dumps([{'lat':'48.8337085', 'lon':'2.3233693'}])), None)
             item.perform(formdata)
             assert 'https://nominatim.entrouvert.org/search' in http_get_page.call_args[0][0]
             assert urlparse.quote('169 rue du chateau, paris') in http_get_page.call_args[0][0]
-...
         pub.site_options.set('options', 'geocoding_service_url', 'http://example.net/')
         with mock.patch('wcs.wf.geolocate.http_get_page') as http_get_page:
             http_get_page.return_value = (None, 200,
                     json.dumps([{'lat':'48.8337085','lon':'2.3233693'}]), None)
                     force_bytes(json.dumps([{'lat':'48.8337085', 'lon':'2.3233693'}])), None)
             item.perform(formdata)
             assert 'http://example.net/?q=' in http_get_page.call_args[0][0]
         pub.site_options.set('options', 'geocoding_service_url', 'http://example.net/?param=value')
         with mock.patch('wcs.wf.geolocate.http_get_page') as http_get_page:
             http_get_page.return_value = (None, 200,
                     json.dumps([{'lat':'48.8337085','lon':'2.3233693'}]), None)
                     force_bytes(json.dumps([{'lat':'48.8337085', 'lon':'2.3233693'}])), None)
             item.perform(formdata)
             assert 'http://example.net/?param=value&' in http_get_page.call_args[0][0]
-...
         formdata.geolocations = None
         with mock.patch('wcs.wf.geolocate.http_get_page') as http_get_page:
             http_get_page.return_value = (None, 500,
                     json.dumps([{'lat':'48.8337085','lon':'2.3233693'}]), None)
                     force_bytes(json.dumps([{'lat':'48.8337085', 'lon':'2.3233693'}])), None)
             item.perform(formdata)
             assert formdata.geolocations == {}
         # check for nominatim returning an empty result set
         formdata.geolocations = None
         with mock.patch('wcs.wf.geolocate.http_get_page') as http_get_page:
             http_get_page.return_value = (None, 200, json.dumps([]), None)
             http_get_page.return_value = (None, 200, force_bytes(json.dumps([])), None)
             item.perform(formdata)
             assert formdata.geolocations == {}
         # check for nominatim bad json
         formdata.geolocations = None
         with mock.patch('wcs.wf.geolocate.http_get_page') as http_get_page:
             http_get_page.return_value = (None, 200, 'bad json', None)
             http_get_page.return_value = (None, 200, b'bad json', None)
             item.perform(formdata)
             assert formdata.geolocations == {}

     from django.utils.six.moves.urllib import parse as urlparse
     from quixote import get_publisher
     from ..qommon import _
     from ..qommon import _, force_str
     from ..qommon import get_logger
     from ..qommon.errors import ConnectionError
     from ..qommon.form import RadiobuttonsWidget, ComputedExpressionWidget, CheckboxWidget
-...
                 get_logger().error('error calling geocoding service [%s]', str(e))
                 return
             try:
                 data = json.loads(data)
                 data = json.loads(force_str(data))
             except ValueError:
                 get_logger().error('non-JSON response from geocoding service')
                 return
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0001-workflows-handle-bytes-returned-from-geolocation-ser.patch