fix rest of tests

Author: thehesiod

aiobotocore/awsrequest.py

@@ -9,10 +9,7 @@ async def _content_prop(self):
         """Content of the response as bytes."""
 
         if self._content is None:
-            # Read the contents.
-            # NOTE: requests would attempt to call stream and fall back
-            # to a custom generator that would call read in a loop, but
-            # we don't rely on this behavior
+            # NOTE: this will cache the data in self.raw
             self._content = await self.raw.read() or bytes()
 
         return self._content
@@ -22,12 +19,6 @@ def content(self):
         return self._content_prop()
 
     async def _text_prop(self):
-        """Content of the response as a proper text type.
-
-        Uses the encoding type provided in the reponse headers to decode the
-        response content into a proper text type. If the encoding is not
-        present in the headers, UTF-8 is used as a default.
-        """
         encoding = botocore.utils.get_encoding_from_headers(self.headers)
         if encoding:
             return (await self.content).decode(encoding)

tests/botocore/test_utils.py

@@ -15,8 +15,10 @@
 from aiobotocore import utils
 from aiobotocore.utils import AioInstanceMetadataFetcher
 from botocore.utils import MetadataRetrievalError, BadIMDSRequestError
+import botocore.awsrequest
 import yarl
-
+from tests.test_response import AsyncBytesIO
+from aiobotocore.awsrequest import AioAWSResponse
 
 # From class TestContainerMetadataFetcher
 def fake_aiohttp_session(responses: Union[List[Tuple[Union[str, object], int]],
@@ -130,7 +132,7 @@ async def test_containermetadatafetcher_retrieve_url_not_json():
 
 class TestInstanceMetadataFetcher(unittest.IsolatedAsyncioTestCase):
     async def asyncSetUp(self):
-        urllib3_session_send = 'aiohttp.ClientSession._request'
+        urllib3_session_send = 'aiobotocore.httpsession.AIOHTTPSession.send'
         self._urllib3_patch = mock.patch(urllib3_session_send)
         self._send = self._urllib3_patch.start()
         self._imds_responses = []
@@ -155,19 +157,14 @@ async def asyncTearDown(self):
 
     def add_imds_response(self, body, status_code=200):
         loop = asyncio.get_running_loop()
-        url = yarl.URL('http://169.254.169.254/')
-        method = 'get'
-        response = ClientResponse(method, url,
-                                  request_info=RequestInfo(url, method, {}),
-                                  writer=mock.AsyncMock(),
-                                  continue100=None,
-                                  timer=TimerNoop(),
-                                  traces=[],
-                                  loop=loop,
-                                  session=mock.AsyncMock())
-        response.status = status_code
-        response._body = body
-        response._headers = {}
+
+        response = AioAWSResponse(
+            url='http://169.254.169.254/',
+            status_code=status_code,
+            headers={},
+            raw=AsyncBytesIO(body)
+        )
+
         self._imds_responses.append(response)
 
     def add_get_role_name_imds_response(self, role_name=None):
@@ -380,7 +377,7 @@ async def test_token_is_included(self):
         # Check that subsequent calls after getting the token include the token.
         self.assertEqual(self._send.call_count, 3)
         for call in self._send.call_args_list[1:]:
-            self.assertEqual(call.kwargs['headers']['x-aws-ec2-metadata-token'],
+            self.assertEqual(call[0][0].headers['x-aws-ec2-metadata-token'],
                              'token')
         self.assertEqual(result, self._expected_creds)
 
@@ -396,7 +393,7 @@ async def test_metadata_token_not_supported_404(self):
             user_agent=user_agent).retrieve_iam_role_credentials()
 
         for call in self._send.call_args_list[1:]:
-            self.assertNotIn('x-aws-ec2-metadata-token', call.kwargs['headers'])
+            self.assertNotIn('x-aws-ec2-metadata-token', call[0][0].headers)
         self.assertEqual(result, self._expected_creds)
 
     @pytest.mark.moto
@@ -411,7 +408,7 @@ async def test_metadata_token_not_supported_403(self):
             user_agent=user_agent).retrieve_iam_role_credentials()
 
         for call in self._send.call_args_list[1:]:
-            self.assertNotIn('x-aws-ec2-metadata-token', call.kwargs['headers'])
+            self.assertNotIn('x-aws-ec2-metadata-token', call[0][0].headers)
         self.assertEqual(result, self._expected_creds)
 
     @pytest.mark.moto
@@ -426,7 +423,7 @@ async def test_metadata_token_not_supported_405(self):
             user_agent=user_agent).retrieve_iam_role_credentials()
 
         for call in self._send.call_args_list[1:]:
-            self.assertNotIn('x-aws-ec2-metadata-token', call.kwargs['headers'])
+            self.assertNotIn('x-aws-ec2-metadata-token', call[0][0].headers)
         self.assertEqual(result, self._expected_creds)
 
     @pytest.mark.moto
@@ -441,7 +438,7 @@ async def test_metadata_token_not_supported_timeout(self):
             user_agent=user_agent).retrieve_iam_role_credentials()
 
         for call in self._send.call_args_list[1:]:
-            self.assertNotIn('x-aws-ec2-metadata-token', call.kwargs['headers'])
+            self.assertNotIn('x-aws-ec2-metadata-token', call[0][0].headers)
         self.assertEqual(result, self._expected_creds)
 
     @pytest.mark.moto
@@ -456,7 +453,7 @@ async def test_token_not_supported_exhaust_retries(self):
             user_agent=user_agent).retrieve_iam_role_credentials()
 
         for call in self._send.call_args_list[1:]:
-            self.assertNotIn('x-aws-ec2-metadata-token', call.kwargs['headers'])
+            self.assertNotIn('x-aws-ec2-metadata-token', call[0][0].headers)
         self.assertEqual(result, self._expected_creds)
 
     @pytest.mark.moto

tests/test_response.py

@@ -21,7 +21,7 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.content = self
 
-    async def read(self, amt):
+    async def read(self, amt=-1):
         if amt == -1:  # aiohttp to regular response
             amt = None
         return super().read(amt)