Backport 6a6ab7d and c5d399 to 3.1 (#2915)

* Call on_chunk_sent when write_eof is called with a valid chunk (#2911)

(cherry picked from commit 6a6ab7d)

* Amends 4ce3c4a sending the chunk signal by write_eof equal than write (#2913)

(cherry picked from commit c5d3999)

CHANGES/2909.bugfix

@@ -0,0 +1 @@
+Call on_chunk_sent when write_eof takes as a param the last chunk

aiohttp/http_writer.py

@@ -105,6 +105,9 @@ async def write_eof(self, chunk=b''):
         if self._eof:
             return
 
+        if chunk and self._on_chunk_sent is not None:
+            await self._on_chunk_sent(chunk)
+
         if self._compress:
             if chunk:
                 chunk = self._compress.compress(chunk)

tests/test_http_writer.py

@@ -171,6 +171,18 @@ async def test_write_calls_callback(protocol, transport, loop):
     assert on_chunk_sent.call_args == mock.call(chunk)
 
 
+async def test_write_eof_calls_callback(protocol, transport, loop):
+    on_chunk_sent = make_mocked_coro()
+    msg = http.StreamWriter(
+        protocol, transport, loop,
+        on_chunk_sent=on_chunk_sent
+    )
+    chunk = b'1'
+    await msg.write_eof(chunk=chunk)
+    assert on_chunk_sent.called
+    assert on_chunk_sent.call_args == mock.call(chunk)
+
+
 async def test_write_to_closing_transport(protocol, transport, loop):
     msg = http.StreamWriter(protocol, transport, loop)