From 8ebdd33ebf16c307dd4803f77651c960e2e15a6c Mon Sep 17 00:00:00 2001 From: Skip Montanaro Date: Sat, 21 Jun 2003 15:59:13 +0000 Subject: [PATCH] check getservbyname with several protocols, not just telnet --- Lib/test/output/test_socket | 1 - Lib/test/test_socket.py | 15 ++++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Lib/test/output/test_socket b/Lib/test/output/test_socket index 65263f0e75fd..d39da9d8a347 100644 --- 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 9cef3167fd6f..9a940b276f9f 100644 --- 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'): -- 2.47.3