]> granicus.if.org Git - python/commitdiff
Issue #25940: Merge self-signed.pythontest.net testing from 3.5
authorMartin Panter <vadmium>
Thu, 14 Jan 2016 13:25:06 +0000 (13:25 +0000)
committerMartin Panter <vadmium>
Thu, 14 Jan 2016 13:25:06 +0000 (13:25 +0000)
1  2 
Lib/test/test_ssl.py
Misc/NEWS

index d1a908826dfb167cd5ac840e624467e33740a70e,f95cfbacd2e7bdb0b033fcab431e26c7fe063a68..b3aee62c7ea18152a90b533ff255824f12b39c2b
@@@ -1712,11 -1711,10 +1712,11 @@@ class NetworkedBIOTests(unittest.TestCa
                               % (count, func.__name__))
          return ret
  
 +    @unittest.skipIf(True, "temporarily disabled: see #25940")
      def test_handshake(self):
-         with support.transient_internet("svn.python.org"):
+         with support.transient_internet(REMOTE_HOST):
              sock = socket.socket(socket.AF_INET)
-             sock.connect(("svn.python.org", 443))
+             sock.connect((REMOTE_HOST, 443))
              incoming = ssl.MemoryBIO()
              outgoing = ssl.MemoryBIO()
              ctx = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
diff --cc Misc/NEWS
Simple merge