Merge remote-tracking branch 'evanj/master' into merge

bdarnell · bdarnell · commit b9d94fd1ad50 · 2012-08-19T19:20:58.000-07:00
diff --git a/tornado/simple_httpclient.py b/tornado/simple_httpclient.py
@@ -326,7 +326,10 @@ def cleanup(self):
 
     def _on_close(self):
         if self.final_callback is not None:
-            raise HTTPError(599, "Connection closed")
+            message = "Connection closed"
+            if self.stream.error:
+                message = str(self.stream.error)
+            raise HTTPError(599, message)
 
     def _on_headers(self, data):
         data = native_str(data.decode("latin1"))
diff --git a/tornado/test/simple_httpclient_test.py b/tornado/test/simple_httpclient_test.py
@@ -283,6 +283,12 @@ def test_host_header(self):
         response = self.wait()
         self.assertTrue(host_re.match(response.body), response.body)
 
+    def test_connection_refused(self):
+        self.http_client.fetch("http://localhost:1/", self.stop)
+        response = self.wait()
+        self.assertEqual(599, response.code)
+        self.assertIn("Connection refused", str(response.error))
+
 
 class CreateAsyncHTTPClientTestCase(AsyncTestCase, LogTrapTestCase):
     def setUp(self):
