do not swallow websocket reader exceptions #255

Author: fafhrd91

CHANGES.txt

@@ -1,12 +1,15 @@
 CHANGES
 =======
 
-0.15.0 (Unreleased)
+0.14.2 (Unreleased)
 -------------------
 
+- Do not swallow websocket reader exceptions #255
+
 - web.Request's read, text, json are memorized #250
 
-0.14.0 (15/01/2014)
+
+0.14.1 (15/01/2014)
 -------------------
 
 - HttpMessage._add_default_headers does not overwrite existing headers #216

aiohttp/web.py

@@ -829,6 +829,16 @@ def wait_closed(self):
             raise RuntimeError('Call .start() first')
         yield from self._closing_fut
 
+    @asyncio.coroutine
+    def write_eof(self):
+        if self._eof_sent:
+            return
+        if self._resp_impl is None:
+            raise RuntimeError("Response has not been started")
+
+        yield from self.wait_closed()
+        self._eof_sent = True
+
     @asyncio.coroutine
     def receive_msg(self):
         if self._reader is None:

tests/test_web_websocket.py

@@ -257,3 +257,59 @@ def go():
                 yield from ws.wait_closed()
 
         self.loop.run_until_complete(go())
+
+    def test_write_eof_not_started(self):
+
+        @asyncio.coroutine
+        def go():
+            ws = WebSocketResponse()
+            with self.assertRaises(RuntimeError):
+                yield from ws.write_eof()
+
+        self.loop.run_until_complete(go())
+
+    def test_write_eof_idempotent(self):
+        req = self.make_request('GET', '/')
+        ws = WebSocketResponse()
+        ws.start(req)
+        ws._closing_fut.set_result(1)
+
+        @asyncio.coroutine
+        def go():
+            yield from ws.write_eof()
+            yield from ws.write_eof()
+            yield from ws.write_eof()
+
+        self.loop.run_until_complete(go())
+
+    def test_write_eof_exception(self):
+        req = self.make_request('GET', '/')
+        ws = WebSocketResponse()
+        ws.start(req)
+        ws._closing_fut.set_exception(ValueError())
+
+        @asyncio.coroutine
+        def go():
+            with self.assertRaises(ValueError):
+                yield from ws.write_eof()
+
+        self.loop.run_until_complete(go())
+
+    def test_receive_msg_exc_in_reader(self):
+        req = self.make_request('GET', '/')
+        ws = WebSocketResponse()
+        ws.start(req)
+
+        exc = ValueError()
+        res = asyncio.Future(loop=self.loop)
+        res.set_exception(exc)
+        ws._reader.read.return_value = res
+
+        @asyncio.coroutine
+        def go():
+            with self.assertRaises(ValueError):
+                yield from ws.receive_msg()
+
+            self.assertIs(ws._closing_fut.exception(), exc)
+
+        self.loop.run_until_complete(go())