From: Ben Darnell <ben@bendarnell.com>
Date: Mon, 17 Feb 2020 21:03:43 +0000 (-0500)
Subject: httpclient_test: Improve error reporting
X-Git-Tag: v6.1.0b1~9^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dcb23eee4eeaaa37f14475dfbf69b33e4e495870;p=thirdparty%2Ftornado.git

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 7b2a43c54..a3233d2b2 100644
--- 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