Successfully pass run_until_complete (#2161)

* Successfully pass run_until_complete

* Add missing test

aiohttp/helpers.py

@@ -63,13 +63,19 @@
 
 class _BaseCoroMixin(base):
 
-    __slots__ = ('_coro', 'send', 'throw', 'close')
+    __slots__ = ('_coro')
 
     def __init__(self, coro):
         self._coro = coro
-        self.send = coro.send
-        self.throw = coro.throw
-        self.close = coro.close
+
+    def send(self, arg):
+        return self._coro.send(arg)
+
+    def throw(self, arg):
+        return self._coro.throw(arg)
+
+    def close(self):
+        return self._coro.close()
 
     @property
     def gi_frame(self):
@@ -113,6 +119,10 @@ def __init__(self, coro, msg):
         self._msg = msg
         self._awaited = False
 
+    def send(self, arg):
+        self._awaited = True
+        return self._coro.send(arg)
+
     @asyncio.coroutine
     def __iter__(self):
         self._awaited = True

tests/test_helpers.py

@@ -27,6 +27,12 @@ def test_no_warn_on_await():
     assert not ctx.list
 
 
+def test_coro_guard_close():
+    guard = helpers.deprecated_noop('Text')
+    guard.close()
+    assert not guard.gi_running
+
+
 # ------------------- parse_mimetype ----------------------------------
 
 def test_parse_mimetype_1():

tests/test_py35/test_client.py

@@ -7,12 +7,32 @@
 
 
 async def test_async_with_session(loop):
-    async with aiohttp.ClientSession(loop=loop) as session:
-        pass
+    with pytest.warns(None) as cm:
+        async with aiohttp.ClientSession(loop=loop) as session:
+            pass
+    assert len(cm.list) == 0
+
+    assert session.closed
+
+
+async def test_session_close_awaitable(loop):
+    session = aiohttp.ClientSession(loop=loop)
+    with pytest.warns(None) as cm:
+        await session.close()
+    assert len(cm.list) == 0
 
     assert session.closed
 
 
+def test_close_run_until_complete_not_deprecated(loop):
+    session = aiohttp.ClientSession(loop=loop)
+
+    with pytest.warns(None) as cm:
+        loop.run_until_complete(session.close())
+
+    assert len(cm.list) == 0
+
+
 async def test_close_resp_on_error_async_with_session(loop, test_server):
     async def handler(request):
         resp = web.StreamResponse(headers={'content-length': '100'})