From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sun, 15 Aug 2010 23:02:22 +0000 (+0000)
Subject: Put test_ciphers in NetworkedTests
X-Git-Tag: v3.2a2~289
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f4c7badc028e3f389a76c293fcb6efa80e16d670;p=python

Put test_ciphers in NetworkedTests
---

diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index 9003a82c77..56a1b04993 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -153,22 +153,6 @@ class BasicSocketTests(unittest.TestCase):
         self.assertTrue(s.startswith("OpenSSL {:d}.{:d}.{:d}".format(major, minor, fix)),
                         (s, t))
 
-    def test_ciphers(self):
-        if not support.is_resource_enabled('network'):
-            return
-        remote = ("svn.python.org", 443)
-        s = ssl.wrap_socket(socket.socket(socket.AF_INET),
-                            cert_reqs=ssl.CERT_NONE, ciphers="ALL")
-        s.connect(remote)
-        s = ssl.wrap_socket(socket.socket(socket.AF_INET),
-                            cert_reqs=ssl.CERT_NONE, ciphers="DEFAULT")
-        s.connect(remote)
-        # Error checking can happen at instantiation or when connecting
-        with self.assertRaisesRegexp(ssl.SSLError, "No cipher can be selected"):
-            s = ssl.wrap_socket(socket.socket(socket.AF_INET),
-                                cert_reqs=ssl.CERT_NONE, ciphers="^$:,;?*'dorothyx")
-            s.connect(remote)
-
     @support.cpython_only
     def test_refcycle(self):
         # Issue #7943: an SSL object doesn't create reference cycles with
@@ -444,6 +428,20 @@ class NetworkedTests(unittest.TestCase):
         if support.verbose:
             sys.stdout.write("\nVerified certificate for svn.python.org:443 is\n%s\n" % pem)
 
+    def test_ciphers(self):
+        remote = ("svn.python.org", 443)
+        s = ssl.wrap_socket(socket.socket(socket.AF_INET),
+                            cert_reqs=ssl.CERT_NONE, ciphers="ALL")
+        s.connect(remote)
+        s = ssl.wrap_socket(socket.socket(socket.AF_INET),
+                            cert_reqs=ssl.CERT_NONE, ciphers="DEFAULT")
+        s.connect(remote)
+        # Error checking can happen at instantiation or when connecting
+        with self.assertRaisesRegexp(ssl.SSLError, "No cipher can be selected"):
+            s = ssl.wrap_socket(socket.socket(socket.AF_INET),
+                                cert_reqs=ssl.CERT_NONE, ciphers="^$:,;?*'dorothyx")
+            s.connect(remote)
+
     def test_algorithms(self):
         # Issue #8484: all algorithms should be available when verifying a
         # certificate.