From: Ben Darnell <ben@bendarnell.com>
Date: Sun, 22 Sep 2013 17:02:11 +0000 (-0400)
Subject: Fix unix socket error test on python 3 on linux.
X-Git-Tag: v3.2.0b1~80
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38330deff4a74ae0d7e25e5778b891ec72692667;p=thirdparty%2Ftornado.git

Fix unix socket error test on python 3 on linux.

The remote address of a unix socket is apparently an empty character
string on mac but an empty byte string on linux.
---

diff --git a/tornado/test/httpserver_test.py b/tornado/test/httpserver_test.py
index 97085c52c..1d45ca604 100644
--- a/tornado/test/httpserver_test.py
+++ b/tornado/test/httpserver_test.py
@@ -526,7 +526,7 @@ class UnixSocketTest(AsyncTestCase):
     def test_unix_socket_bad_request(self):
         # Unix sockets don't have remote addresses so they just return an
         # empty string.
-        with ExpectLog(gen_log, "Malformed HTTP request from ''"):
+        with ExpectLog(gen_log, "Malformed HTTP request from"):
             self.stream.write(b"garbage\r\n\r\n")
             self.stream.read_until_close(self.stop)
             response = self.wait()