From: Nick Coutsos <nick@coutsos.com>
Date: Thu, 23 Jun 2016 02:45:53 +0000 (-0400)
Subject: Skip testing malformed 204 responses for curl http client
X-Git-Tag: v4.4.0b1~2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0330fcc0259e1a6ac07cb77f7b75f4af86826e1;p=thirdparty%2Ftornado.git

Skip testing malformed 204 responses for curl http client
---

diff --git a/tornado/test/simple_httpclient_test.py b/tornado/test/simple_httpclient_test.py
index 788478082..a5624af25 100644
--- a/tornado/test/simple_httpclient_test.py
+++ b/tornado/test/simple_httpclient_test.py
@@ -631,10 +631,11 @@ class HTTP204NoContentTestCase(AsyncHTTPTestCase):
 
     def test_204_invalid_content_length(self):
         # 204 status with non-zero content length is malformed
-        with ExpectLog(gen_log, "Malformed HTTP message"):
-            response = self.fetch("/?error=1")
-            if not self.http1:
-                self.skipTest("requires HTTP/1.x")
+        response = self.fetch("/?error=1")
+        if not self.http1:
+            self.skipTest("requires HTTP/1.x")
+        if self.http_client.configured_class != SimpleAsyncHTTPClient:
+            self.skipTest("curl client accepts invalid headers")
         self.assertEqual(response.code, 599)