Fix incorrect length when creating an HTTPResponse from FakeSocket

Due to the response_str encountering inadvertent mutation elsewhere in
the code, the size slightly changes and with a large response, does not
correctly get reported to HTTPResponse.

We manually specify the length of the response to the size of the
BytesIO buffer and this gives HTTPResponse enough room to read to the
end of the response.

The ODataHttpResponse.from_string method fails because in the process of
converting the multipart response to and from bytes and also being
passed around, some bytes are being added somewhere and causing the size
of the data to no longer be equal to Content-Type.

This causes HTTPResponse.begin() to seed the wrong length attribute,
which causes the file pointer to not read far enough which, in
turn, causes a JSON parse error. So to clean this up we just need
to manually set response.length to how large the body is now after
all its encoding and decoding.

Signed-off-by: Jakub Filak <[email protected]>

Author: bartonip

CHANGELOG.md

@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Fixed
 - URL encode $filter contents - Barton Ip
+- JSON errors caused by invalid content length of Batch responses - Barton Ip
 
 ## [1.5.0]
 

pyodata/v2/service.py

@@ -134,6 +134,7 @@ def makefile(self, *args, **kwargs):
         source = FakeSocket(data)
         response = HTTPResponse(source)
         response.begin()
+        response.length = response.fp.__sizeof__()
 
         return ODataHttpResponse(
             response.getheaders(),

tests/enormous_batch_response

@@ -308,6 +308,18 @@
                                     FromRole="EmployeeRole" ToRole="AddressRole"/>
             </EntityType>
 
+            <EntityType Name="Enumeration">
+                <Key>
+                    <PropertyRef Name="EntityType"/>
+                    <PropertyRef Name="PropertyName"/>
+                    <PropertyRef Name="RefKey"/>
+                </Key>
+                <Property Name="EntityType" Type="Edm.String" Nullable="false" MaxLength="40" />
+                <Property Name="PropertyName" Type="Edm.String" Nullable="false" MaxLength="40"/>
+                <Property Name="RefKey" Type="Edm.String" Nullable="false" MaxLength="50" />
+                <Property Name="Value" Type="Edm.String" Nullable="false" MaxLength="255" />
+            </EntityType>
+
             <EntityType Name="Address">
                 <Key>
                     <PropertyRef Name="ID"/>
@@ -335,6 +347,8 @@
                            sap:content-version="1"/>
 
                 <EntitySet Name="Employees" EntityType="Employee"/>
+                <EntitySet Name="Enumerations" EntityType="Enumeration"/>
+
 
                 <EntitySet Name="Addresses" EntityType="Address"/>
 

tests/metadata.xml

@@ -30,7 +30,8 @@ def test_edmx(schema):
         'CarIDPic',
         'Customer',
         'Order',
-        'EnumTest'
+        'EnumTest',
+        'Enumeration'
     }
 
     assert set((entity_set.name for entity_set in schema.entity_sets)) == {
@@ -46,7 +47,8 @@ def test_edmx(schema):
         'CarIDPics',
         'Customers',
         'Orders',
-        'EnumTests'
+        'EnumTests',
+        'Enumerations'
     }
 
     assert set((enum_type.name for enum_type in schema.enum_types)) == {

tests/test_model_v2.py

@@ -11,7 +11,7 @@
 from pyodata.exceptions import PyODataException, HttpError, ExpressionError
 from pyodata.v2.service import EntityKey, EntityProxy, GetEntitySetFilter
 
-from tests.conftest import assert_request_contains_header
+from tests.conftest import assert_request_contains_header, contents_of_fixtures_file
 
 
 URL_ROOT = 'http://odatapy.example.com'
@@ -1369,6 +1369,33 @@ def test_batch_request(service):
     assert chset_response[0] is None   # response to update request is None
 
 
+@responses.activate
+def test_enormous_batch_request(service):
+    """Batch requests"""
+
+    # pylint: disable=redefined-outer-name
+
+    response_body = contents_of_fixtures_file('enormous_batch_response')
+
+    responses.add(
+        responses.POST,
+        '{0}/$batch'.format(URL_ROOT),
+        body=response_body,
+        content_type='multipart/mixed; boundary=16804F9C063D8720EACA19F7DFB3CD4A0',
+        status=202)
+
+    batch = service.create_batch()
+
+    employee_request = service.entity_sets.Enumerations.get_entities()
+
+    batch.add_request(employee_request)
+
+    response = batch.execute()
+
+    assert len(response) == 1
+    assert len(response[0]) == 1016
+
+
 @responses.activate
 def test_batch_request_failed_changeset(service):
     """Check single response for changeset"""