rebase and fixups

aiohttp/http_writer.py

@@ -165,7 +165,7 @@ def set_transport(self, transport):
     async def get_transport(self):
         if self._transport is None:
             if self._drain_waiter is None:
-                self._drain_waiter = create_future(self.loop)
+                self._drain_waiter = self.loop.create_future()
             await self._drain_waiter
         return self._transport
 
@@ -274,10 +274,11 @@ async def write_eof(self, chunk=b''):
         self._transport = None
         self._stream.release()
 
-    @asyncio.coroutine
-    def drain(self):
+    async def drain(self):
         if self._transport is not None:
-            yield from self._stream.drain()
+            print(self._stream)
+            print(self._stream.drain)
+            await self._stream.drain()
         else:
             # wait for transport
             await self.get_transport()

tests/test_client_request.py

@@ -63,11 +63,15 @@ def stream(buf, transport):
     stream = mock.Mock()
     stream.transport = transport
 
+
     def acquire(writer):
         writer.set_transport(transport)
+    async def drain():
+        pass
 
     stream.acquire.side_effect = acquire
-    stream.drain.return_value = ()
+    stream.drain.side_effect = drain
+
     return stream
 
 

tests/test_http_writer.py

@@ -30,9 +30,11 @@ def stream(transport):
 
     def acquire(writer):
         writer.set_transport(transport)
+    async def drain():
+        pass
 
     stream.acquire = acquire
-    stream.drain.return_value = ()
+    stream.drain = drain
     return stream