Response of None on failure

diff --git a/docs/overview.rst b/docs/overview.rst
index f066b47d05b077e5e843dbf3762e098b3740b92e..229411914a7980f0c1125ef2dc5a074fda5598e4 100644 (file)
--- a/docs/overview.rst
+++ b/docs/overview.rst
@@ -296,7 +296,7 @@ directory as your Python file, you could render this template with:
             self.render("template.html", title="My title", items=items)
 
 Tornado templates support *control statements* and *expressions*.
-Control statements are surronded by ``{%`` and ``%}``, e.g.,
+Control statements are surrounded by ``{%`` and ``%}``, e.g.,
 ``{% if len(items) > 2 %}``. Expressions are surrounded by ``{{`` and
 ``}}``, e.g., ``{{ items[0] }}``.
 

diff --git a/tornado/test/websocket_test.py b/tornado/test/websocket_test.py
index 87dae7697342070992ae05031ca856ccec78d4a6..dae5d88b5a981fafd18c562cfc3b4054884c1da1 100644 (file)
--- a/tornado/test/websocket_test.py
+++ b/tornado/test/websocket_test.py
@@ -202,7 +202,7 @@ class WebSocketTest(AsyncHTTPTestCase):
 
         response = yield ws.read_message()
 
-        self.assertEqual(response, 'hello')
+        self.assertEqual(response, None)
         ws.close()
         yield self.close_future