toulouse-maelis: [functests] adding tests on capacities (#77634)

passerelle/apps/mdel/models.py

@@ -16,7 +16,6 @@
 
 import json
 import os
-import zipfile
 
 from django.db import models
 from django.utils.translation import gettext_lazy as _
@@ -418,10 +417,7 @@ class Demand(models.Model):
 
         path = os.path.join(self.resource.output_dir, zip_file)
 
-        try:
-            content = get_file_content_from_zip(path, 'message.xml')
-        except zipfile.BadZipFile:
-            raise APIError('zipfile error')
+        content = get_file_content_from_zip(path, 'message.xml')
         element = mdel.etree.fromstring(content)
         majs = element.findall('ns2:Body/*/*/*/ns2:Maj', namespace)
 

passerelle/apps/opengis/models.py

@@ -215,16 +215,12 @@ class OpenGIS(BaseResource):
         response = self.requests.get(self.wfs_service_url, params=params)
         data = []
         try:
-            json_response = response.json()
+            response = response.json()
         except ValueError:
             self.handle_opengis_error(response)
             # if handle_opengis_error did not raise an error, we raise a generic one
             raise APIError('OpenGIS Error: unparsable error', data={'content': repr(response.content[:1024])})
-        if not isinstance(json_response, dict) or 'features' not in json_response:
-            raise APIError(
-                'OpenGIS Error: bad result format', data={'content': repr(response.content[:1024])}
-            )
-        for feature in json_response['features']:
+        for feature in response['features']:
             feature['text'] = feature['properties'].get(property_name)
             data.append(feature)
         return {'data': data}

tests/test_mdel.py

@@ -551,13 +551,6 @@ def test_get_status(app, setup):
     assert data['comment'] == 'Dossier accepté'
     assert Demand.objects.get(demand_id='102-2-AEC-LA').status == 'accepted'
 
-    # bad zipfile
-    filepath = os.path.join(get_resource_base_dir(), 'test', 'outputs', '102-2-aec-la--4.zip')
-    with open(filepath, 'w') as f:
-        f.write(' ')
-    resp = app.get('/mdel/test/status', params={'demand_id': '102-2-AEC-LA'}, status=200)
-    assert resp.json['err_desc'] == 'zipfile error'
-
 
 def test_get_status_unknown_demand(app, setup):
     resp = app.get('/mdel/test/status', params={'demand_id': '1-14-ILE-LA'})

tests/test_opengis.py

@@ -585,34 +585,6 @@ def test_get_feature_error2(mocked_get, app, connector):
     assert '<ows:' in result['data']['content']
 
 
-@mock.patch('passerelle.utils.Request.get')
-def test_get_feature_bad_result(mocked_get, app, connector):
-    def keyerror(url, **kwargs):
-        if kwargs['params'].get('request') == 'GetCapabilities':
-            assert kwargs['params'].get('service')
-            return tests.utils.FakedResponse(status_code=200, content=FAKE_SERVICE_CAPABILITIES)
-        return tests.utils.FakedResponse(status_code=200, content=json.dumps({}))
-
-    endpoint = tests.utils.generic_endpoint_url('opengis', 'features', slug=connector.slug)
-    mocked_get.side_effect = keyerror
-    resp = app.get(endpoint, params={'type_names': 'ref_metro_limites_communales', 'property_name': 'nom'})
-    assert resp.json['err'] == 1
-    assert resp.json['err_desc'] == 'OpenGIS Error: bad result format'
-    assert resp.json['data'] == {'content': "'{}'"}
-
-    def typeerror(url, **kwargs):
-        if kwargs['params'].get('request') == 'GetCapabilities':
-            assert kwargs['params'].get('service')
-            return tests.utils.FakedResponse(status_code=200, content=FAKE_SERVICE_CAPABILITIES)
-        return tests.utils.FakedResponse(status_code=200, content=json.dumps([]))
-
-    mocked_get.side_effect = typeerror
-    resp = app.get(endpoint, params={'type_names': 'ref_metro_limites_communales', 'property_name': 'nom'})
-    assert resp.json['err'] == 1
-    assert resp.json['err_desc'] == 'OpenGIS Error: bad result format'
-    assert resp.json['data'] == {'content': "'[]'"}
-
-
 @pytest.mark.parametrize(
     "server_responses, version, typename_label",
     [(geoserver_responses_v1_0_0, '1.0.0', 'typename'), (geoserver_responses, '2.0.0', 'typenames')],