0001-api_particulier-fix-connection-error-42659.patch

Lauréline Guérin, 11 juin 2020 14:56

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

Subject: [PATCH] api_particulier: fix connection error (#42659)

 passerelle/apps/api_particulier/models.py |  4 +-
 tests/test_api_particulier.py             | 61 ++++++++++++-----------
 2 files changed, 33 insertions(+), 32 deletions(-)

     from passerelle.base.models import BaseResource
     from passerelle.utils.api import endpoint
     from passerelle.utils.conversion import exception_to_text
     from passerelle.utils.jsonresponse import APIError
-...
             headers = {'X-API-KEY': self.api_key}
             if user:
                 headers['X-User'] = user
             response = None
             try:
                 response = self.requests.get(
                     url,
-...
             except requests.RequestException as e:
                 raise APIError(
                     u'API-particulier platform "%s" connection error: %s' %
                     (self.platform, response.status_code),
                     (self.platform, exception_to_text(e)),
                     log_error=True,
                     data={
                         'code': 'connection-error',

     from django.core.urlresolvers import reverse
     import requests
     from passerelle.apps.api_particulier.models import APIParticulier
     from passerelle.base.models import ResourceLog
-...
         return response(500, {'error': 500}, request=request)
     @urlmatch(netloc=r'^particulier.*\.api\.gouv\.fr$')
     def api_particulier_connection_error(url, request):
         raise requests.RequestException('connection timed-out')
     @urlmatch(netloc=r'^particulier.*\.api\.gouv\.fr$')
     def api_particulier_error_not_json(url, request):
         return response(200, 'something bad happened', request=request)
-...
     def test_error(app, resource, mock_api_particulier):
         vector = [
             (['impots_svair', 'avis-imposition'], {
                 'numero_fiscal': 12,
                 'reference_avis': 15,
             }),
             (['caf_famille', 'situation-familiale'], {
                 'code_postal': 12,
                 'numero_allocataire': 15
             }),
+        ]
         with HTTMock(api_particulier_error_500):
             def do(endpoint, params):
                 resp = endpoint_get(
-...
                 assert resp.json['err'] == 1
                 assert resp.json['data']['status_code'] == 500
                 assert resp.json['data']['code'] == 'non-200'
             vector = [
                 (['impots_svair', 'avis-imposition'], {
                     'numero_fiscal': 12,
                     'reference_avis': 15,
                 }),
                 (['caf_famille', 'situation-familiale'], {
                     'code_postal': 12,
                     'numero_allocataire': 15
                 }),
+            ]
             for endpoints, params in vector:
                 for endpoint in endpoints:
                     do(endpoint, params)
-...
                 assert resp.json['err'] == 1
                 assert 'returned non-JSON content' in resp.json['err_desc']
                 assert resp.json['data']['code'] == 'non-json'
             vector = [
                 (['impots_svair', 'avis-imposition'], {
                     'numero_fiscal': 12,
                     'reference_avis': 15,
                 }),
                 (['caf_famille', 'situation-familiale'], {
                     'code_postal': 12,
                     'numero_allocataire': 15
                 }),
+            ]
             for endpoints, params in vector:
                 for endpoint in endpoints:
                     do(endpoint, params)
-...
                 assert resp.json['err'] == 1
                 assert resp.json['err_desc'] == 'No matching tax notice was found.'
                 assert resp.json['data']['code'] == 'not-found'
             vector = [
                 (['impots_svair', 'avis-imposition'], {
                     'numero_fiscal': 12,
                     'reference_avis': 15,
                 }),
                 (['caf_famille', 'situation-familiale'], {
                     'code_postal': 12,
                     'numero_allocataire': 15
                 }),
+            ]
             for endpoints, params in vector:
                 for endpoint in endpoints:
                     do(endpoint, params)
         with HTTMock(api_particulier_connection_error):
             def do(endpoint, params):
                 resp = endpoint_get(
                     '/api-particulier/test/%s' % endpoint,
                     app,
                     resource,
                     endpoint,
                     params=params)
                 assert resp.status_code == 200
                 assert resp.json['err'] == 1
                 assert resp.json['err_desc'] == 'API-particulier platform "test" connection error: connection timed-out'
             for endpoints, params in vector:
                 for endpoint in endpoints:
                     do(endpoint, params)
+    -

Projet

Général

Profil

Produits Entr'ouvert » Passerelle

0001-api_particulier-fix-connection-error-42659.patch