Rearrange test_socket_ssl so that a skip is expected iff the network

resource isn't enabled or the socket module doesn't support ssl.

1 files changed, 24 insertions, 19 deletions

diff --git a/Lib/test/test_socket_ssl.py b/Lib/test/test_socket_ssl.py
index 9c0d8cc..eb00b9b 100644
--- a/Lib/test/test_socket_ssl.py
+++ b/Lib/test/test_socket_ssl.py
@@ -1,27 +1,32 @@
 # Test just the SSL support in the socket module, in a moderately bogus way.
 
 from test import test_support
+import socket
 
-# Optionally test SSL support.  This currently requires the 'network' resource
-# as given on the regrtest command line.  If not available, nothing after this
-# line will be executed.
-test_support.requires('network')
+# Optionally test SSL support.  This requires the 'network' resource as given
+# on the regrtest command line.
+skip_expected = not (test_support.is_resource_enabled('network') and
+                     hasattr(socket, "ssl"))
 
-import socket
-if not hasattr(socket, "ssl"):
-    raise test_support.TestSkipped("socket module has no ssl support")
+def test_main():
+    test_support.requires('network')
+    if not hasattr(socket, "ssl"):
+        raise test_support.TestSkipped("socket module has no ssl support")
+
+    import urllib
 
-import urllib
+    socket.RAND_status()
+    try:
+        socket.RAND_egd(1)
+    except TypeError:
+        pass
+    else:
+        print "didn't raise TypeError"
+    socket.RAND_add("this is a random string", 75.0)
 
-socket.RAND_status()
-try:
-    socket.RAND_egd(1)
-except TypeError:
-    pass
-else:
-    print "didn't raise TypeError"
-socket.RAND_add("this is a random string", 75.0)
+    f = urllib.urlopen('https://sf.net')
+    buf = f.read()
+    f.close()
 
-f = urllib.urlopen('https://sf.net')
-buf = f.read()
-f.close()
+if __name__ == "__main__":
+    test_main()