[Python-checkins] python/dist/src/Lib/test test_socket.py, 1.69, 1.70

[bwarsaw at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Lib/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13892/Lib/test

Modified Files:
	test_socket.py 
Log Message:
Added socket.getservbyport(), and make its second argument and that of
getservbyname() optional.  Update the tests and the docs.


Index: test_socket.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_socket.py,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -d -r1.69 -r1.70
*** test_socket.py	31 May 2004 03:09:25 -0000	1.69
--- test_socket.py	28 Jun 2004 00:50:37 -0000	1.70
***************
*** 285,299 ****
              self.assertRaises(OverflowError, func, 1L<<34)
  
!     def testGetServByName(self):
!         # Testing getservbyname()
!         # try a few protocols - not everyone has telnet enabled
!         for proto in ("telnet", "ssh", "www", "ftp"):
!             try:
!                 socket.getservbyname(proto, 'tcp')
!                 break
!             except socket.error:
!                 pass
              try:
!                 socket.getservbyname(proto, 'udp')
                  break
              except socket.error:
--- 285,296 ----
              self.assertRaises(OverflowError, func, 1L<<34)
  
!     def testGetServBy(self):
!         eq = self.assertEqual
!         # Find one service that exists, then check all the related interfaces.
!         # I've ordered this by protocols that have both a tcp and udp
!         # protocol, at least for modern Linuxes.
!         for service in ('ssh', 'www', 'echo', 'imap2'):
              try:
!                 port = socket.getservbyname(service, 'tcp')
                  break
              except socket.error:
***************
*** 301,304 ****
--- 298,316 ----
          else:
              raise socket.error
+         # Try same call with optional protocol omitted
+         port2 = socket.getservbyname(service)
+         eq(port, port2)
+         # Try udp, but don't barf it it doesn't exist
+         try:
+             udpport = socket.getservbyname(service, 'udp')
+         except socket.error:
+             udpport = None
+         else:
+             eq(udpport, port)
+         # Now make sure the lookup by port returns the same service name
+         eq(socket.getservbyport(port2), service)
+         eq(socket.getservbyport(port, 'tcp'), service)
+         if udpport is not None:
+             eq(socket.getservbyport(udpport, 'udp'), service)
  
      def testDefaultTimeout(self):