httpclient_test: Improve error reporting

Without this try/finally, if this test ever fails, errors can be
reported in a confusing way.

diff --git a/tornado/test/httpclient_test.py b/tornado/test/httpclient_test.py
index 7b2a43c54f61f39eee1955ede5b35b70eacac7a0..a3233d2b2764c78e9241dea2ecdfe974285c39d2 100644 (file)
--- a/tornado/test/httpclient_test.py
+++ b/tornado/test/httpclient_test.py
@@ -500,10 +500,12 @@ X-XSS-Protection: 1;
                 stream.close()
 
             netutil.add_accept_handler(sock, accept_callback)  # type: ignore
-            resp = self.fetch("http://127.0.0.1:%d/" % port)
-            resp.rethrow()
-            self.assertEqual(resp.headers["X-XSS-Protection"], "1; mode=block")
-            self.io_loop.remove_handler(sock.fileno())
+            try:
+                resp = self.fetch("http://127.0.0.1:%d/" % port)
+                resp.rethrow()
+                self.assertEqual(resp.headers["X-XSS-Protection"], "1; mode=block")
+            finally:
+                self.io_loop.remove_handler(sock.fileno())
 
     def test_304_with_content_length(self):
         # According to the spec 304 responses SHOULD NOT include