check getservbyname with several protocols, not just telnet

diff --git a/Lib/test/output/test_socket b/Lib/test/output/test_socket
index 65263f0e75fd0af11e640907fa87a10bf67e67cb..d39da9d8a34730cb0e1db99c87718fcfcb788eb1 100644 (file)
--- a/Lib/test/output/test_socket
+++ b/Lib/test/output/test_socket
@@ -1,3 +1,2 @@
 test_socket
 socket.error
-23

diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index 9cef3167fd6fe6645a6891c9eb5d2478d89e7cd6..9a940b276f9fe59a38619c7f2d600bcedf055ecc 100644 (file)
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -84,11 +84,20 @@ else:
     print 'FQDN not found'
 
 if hasattr(socket, 'getservbyname'):
-    print socket.getservbyname('telnet', 'tcp')
+    # try a few protocols - not everyone has telnet enabled
+    class Found(Exception): pass
     try:
-        socket.getservbyname('telnet', 'udp')
-    except socket.error:
+        for proto in ("telnet", "ssh", "www", "ftp"):
+            for how in ("tcp", "udp"):
+                try:
+                    socket.getservbyname(proto, how)
+                    raise Found
+                except socket.error:
+                    pass
+    except Found:
         pass
+    else:
+        print "socket.error", "socket.getservbyname failed"
 
 import sys
 if not sys.platform.startswith('java'):