0001-geolocation-record-LoggedError-on-address-string-err.patch

Lauréline Guérin, 16 mars 2021 11:58

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

Subject: [PATCH] geolocation: record LoggedError on address string error
 (#51773)

 tests/test_workflows.py | 51 +++++++++++++++++++++++++----------------
 wcs/wf/geolocate.py     | 12 ++++++----
 2 files changed, 39 insertions(+), 24 deletions(-)

         assert formdata.get_criticality_level_object().name == 'green'
     def test_geolocate_address(pub):
     def test_geolocate_address(two_pubs):
         if two_pubs.is_using_postgresql():
             two_pubs.loggederror_class.wipe()
         formdef = FormDef()
         formdef.geolocations = {'base': 'bla'}
         formdef.name = 'baz'
-...
         formdata.data = {'1': '169 rue du chateau'}
         formdata.just_created()
         formdata.store()
         pub.substitutions.feed(formdata)
         two_pubs.substitutions.feed(formdata)
         item = GeolocateWorkflowStatusItem()
         item.method = 'address_string'
-...
             assert int(formdata.geolocations['base']['lat']) == 48
             assert int(formdata.geolocations['base']['lon']) == 2
         pub.load_site_options()
         pub.site_options.set('options', 'nominatim_key', 'KEY')
         two_pubs.load_site_options()
         two_pubs.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,
-...
             assert int(formdata.geolocations['base']['lat']) == 48
             assert int(formdata.geolocations['base']['lon']) == 2
         pub.load_site_options()
         pub.site_options.set('options', 'geocoding_service_url', 'http://example.net/')
         two_pubs.load_site_options()
         two_pubs.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,
-...
             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')
         two_pubs.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,
-...
         formdata.geolocations = None
         item.perform(formdata)
         assert formdata.geolocations == {}
         if two_pubs.is_using_postgresql():
             assert two_pubs.loggederror_class.count() == 1
             logged_error = two_pubs.loggederror_class.select()[0]
             assert (
                 logged_error.summary
                 == 'error in template for address string [syntax error in ezt template: unclosed block at line 1 and column 24]'
+            )
             assert logged_error.formdata_id == str(formdata.id)
             assert logged_error.exception_class == 'TemplateError'
             assert (
                 logged_error.exception_message
                 == 'syntax error in ezt template: unclosed block at line 1 and column 24'
+            )
         # check for None
         item.address_string = '=None'
-...
         item.perform(formdata)
         assert formdata.geolocations == {}
         # check for nominatim server error
         formdata.geolocations = None
         with mock.patch('wcs.wf.geolocate.http_get_page') as http_get_page:
             http_get_page.return_value = (
                 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
         item.address_string = '[form_var_string], paris, france'
         formdata.geolocations = None
         with mock.patch('wcs.wf.geolocate.http_get_page') as http_get_page:
             http_get_page.return_value = (None, 200, force_bytes(json.dumps([])), None)
-...
         # check for nominatim connection error
         formdata.geolocations = None
         with mock.patch('wcs.wf.geolocate.http_get_page') as http_get_page:
             http_get_page.side_effect = ConnectionError
             http_get_page.side_effect = ConnectionError('some error')
             item.perform(formdata)
             assert formdata.geolocations == {}
         if two_pubs.is_using_postgresql():
             assert two_pubs.loggederror_class.count() == 2
             logged_error = two_pubs.loggederror_class.select()[1]
             assert logged_error.summary == 'error calling geocoding service [some error]'
             assert logged_error.formdata_id == str(formdata.id)
             assert logged_error.exception_class == 'ConnectionError'
             assert logged_error.exception_message == 'some error'
     def test_geolocate_image(pub):

                 try:
                     address = self.compute(self.address_string, raises=True)
                 except Exception as e:
                     get_logger().error('error in template for address string [%r]', e)
                     get_publisher().record_error(
                         _('error in template for address string [%s]') % str(e), formdata=formdata, exception=e
+                    )
                     return
             else:
                 # this is when the action is being executed to prefill a map field;
-...
             try:
                 response, status, data, auth_header = http_get_page(url, raise_on_http_errors=True)
             except ConnectionError as e:
                 get_logger().error('error calling geocoding service [%s]', str(e))
                 get_publisher().record_error(
                     _('error calling geocoding service [%s]') % str(e), formdata=formdata, exception=e
+                )
                 return
             try:
                 data = json.loads(force_str(data))
             except ValueError:
                 get_logger().error('non-JSON response from geocoding service')
                 get_logger().debug('non-JSON response from geocoding service')
                 return
             if len(data) == 0 or isinstance(data, dict):
                 get_logger().info('error finding location')
                 get_logger().debug('error finding location')
                 return
             coords = data[0]
             return normalize_geolocation({'lon': coords['lon'], 'lat': coords['lat']})
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0001-geolocation-record-LoggedError-on-address-string-err.patch