Tests cleanup

aiobotocore/client.py

@@ -133,9 +133,10 @@ def __aexit__(self, exc_type, exc_val, exc_tb):
                                                              exc_val, exc_tb)
 
     def close(self):
-        """Close all http connections"""
-        # ClientSession.close() from aiohttp returns asyncio.Future here so
-        # this method could be used with yield from/await
+        """Close all http connections. This is coroutine, and should be
+        awaited. Method will be coroutine (instead returning Future) once
+        aiohttp does that.
+        """
         return self._endpoint._aio_session.close()
 
 

setup.py

@@ -4,7 +4,7 @@
 from setuptools import setup, find_packages
 
 
-install_requires = ['botocore>=1.4.0, <=1.4.73', 'aiohttp>=0.21.2']
+install_requires = ['botocore>=1.4.0, <=1.4.28', 'aiohttp>=1.1.0']
 
 PY_VER = sys.version_info
 

tests/test_basic_s3.py

@@ -124,6 +124,7 @@ def test_get_object_stream_wrapper(s3_client, create_object, bucket_name):
     chunk2 = yield from body.read()
     assert chunk1 == b'b'
     assert chunk2 == b'ody contents'
+    response['Body'].close()
 
 
 @pytest.mark.run_loop
@@ -204,6 +205,7 @@ def test_unicode_key_put_list(s3_client, bucket_name, create_object):
     assert parsed['Contents'][0]['Key'] == key_name
     parsed = yield from s3_client.get_object(Bucket=bucket_name, Key=key_name)
     data = yield from parsed['Body'].read()
+    parsed['Body'].close()
     assert data == b'foo'
 
 
@@ -255,6 +257,7 @@ def test_copy_with_quoted_char(s3_client, create_object, bucket_name):
     # Now verify we can retrieve the copied object.
     resp = yield from s3_client.get_object(Bucket=bucket_name, Key=key_name2)
     data = yield from resp['Body'].read()
+    resp['Body'].close()
     assert data == b'foo'
 
 
@@ -271,6 +274,7 @@ def test_copy_with_query_string(s3_client, create_object, bucket_name):
     # Now verify we can retrieve the copied object.
     resp = yield from s3_client.get_object(Bucket=bucket_name, Key=key_name2)
     data = yield from resp['Body'].read()
+    resp['Body'].close()
     assert data == b'foo'
 
 
@@ -287,6 +291,7 @@ def test_can_copy_with_dict_form(s3_client, create_object, bucket_name):
     # Now verify we can retrieve the copied object.
     resp = yield from s3_client.get_object(Bucket=bucket_name, Key=key_name2)
     data = yield from resp['Body'].read()
+    resp['Body'].close()
     assert data == b'foo'