From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sat, 1 May 2010 20:33:30 +0000 (+0000)
Subject: Merged revisions 80692 via svnmerge from
X-Git-Tag: v3.1.3rc1~828
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7effde0014129bb2577ad6eb9bf0f71b77262390;p=python

Merged revisions 80692 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r80692 | antoine.pitrou | 2010-05-01 22:29:38 +0200 (sam., 01 mai 2010) | 9 lines

  Merged revisions 80690 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r80690 | antoine.pitrou | 2010-05-01 22:26:58 +0200 (sam., 01 mai 2010) | 3 lines

    Remove duplicate test
  ........
................
---

diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index d76472a0fe..cef8ef66e0 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -39,27 +39,6 @@ def handle_error(prefix):
 
 class BasicTests(unittest.TestCase):
 
-    def test_connect(self):
-        if not support.is_resource_enabled('network'):
-            return
-        s = ssl.wrap_socket(socket.socket(socket.AF_INET),
-                            cert_reqs=ssl.CERT_NONE)
-        s.connect(("svn.python.org", 443))
-        c = s.getpeercert()
-        if c:
-            self.fail("Peer cert %s shouldn't be here!")
-        s.close()
-
-        # this should fail because we have no verification certs
-        s = ssl.wrap_socket(socket.socket(socket.AF_INET),
-                            cert_reqs=ssl.CERT_REQUIRED)
-        try:
-            s.connect(("svn.python.org", 443))
-        except ssl.SSLError:
-            pass
-        finally:
-            s.close()
-
     def test_constants(self):
         ssl.PROTOCOL_SSLv2
         ssl.PROTOCOL_SSLv23