]> git.ipfire.org Git - thirdparty/tornado.git/commitdiff
Fix unix socket error test on python 3 on linux.
authorBen Darnell <ben@bendarnell.com>
Sun, 22 Sep 2013 17:02:11 +0000 (13:02 -0400)
committerBen Darnell <ben@bendarnell.com>
Sun, 22 Sep 2013 17:02:11 +0000 (13:02 -0400)
The remote address of a unix socket is apparently an empty character
string on mac but an empty byte string on linux.

tornado/test/httpserver_test.py

index 97085c52c0e627a0bccfcdbc3569f6942cd1cffd..1d45ca6042a02c6823d5601ed4c87e72d968da6e 100644 (file)
@@ -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()