From: Daniel James Visentin <daniel.visentin@nicta.com.au>
Date: Tue, 23 Dec 2014 01:09:48 +0000 (+1100)
Subject: Add test to ensure stream start_tls calls use the server_hostname parameter
X-Git-Tag: v4.1.0b1~35^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9f14510b3d691b52472963e7bd4e3fcba308681;p=thirdparty%2Ftornado.git

Add test to ensure stream start_tls calls use the server_hostname parameter
---

diff --git a/tornado/test/iostream_test.py b/tornado/test/iostream_test.py
index f54eed6bb..280416844 100644
--- a/tornado/test/iostream_test.py
+++ b/tornado/test/iostream_test.py
@@ -841,10 +841,10 @@ class TestIOStreamStartTLS(AsyncTestCase):
         recv_line = yield self.client_stream.read_until(b"\r\n")
         self.assertEqual(line, recv_line)
 
-    def client_start_tls(self, ssl_options=None):
+    def client_start_tls(self, ssl_options=None, server_hostname=None):
         client_stream = self.client_stream
         self.client_stream = None
-        return client_stream.start_tls(False, ssl_options)
+        return client_stream.start_tls(False, ssl_options, server_hostname)
 
     def server_start_tls(self, ssl_options=None):
         server_stream = self.server_stream
@@ -881,6 +881,16 @@ class TestIOStreamStartTLS(AsyncTestCase):
             with self.assertRaises(ssl.SSLError):
                 yield client_future
 
+    @gen_test
+    def test_check_hostname(self):
+        self.server_start_tls(_server_ssl_options())
+        client_future = self.client_start_tls(
+            ssl.create_default_context(),
+            server_hostname=b'127.0.0.1')
+        with ExpectLog(gen_log, "SSL Error"):
+            with self.assertRaises(ssl.SSLError):
+                yield client_future
+
 
 @skipIfNonUnix
 class TestPipeIOStream(AsyncTestCase):