[Python-checkins] python/dist/src/Lib/test test_socketserver.py, 1.9, 1.10

[aimacintyre at users.sourceforge.net]

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

Modified Files:
	test_socketserver.py 
Log Message:
Fixes for AF_UNIX support on OS/2:
- return the full size of the sockaddr_un structure, without which
  bind() fails with EINVAL;
- set test_socketserver to use a socket name that meets the form
  required by the underlying implementation;
- don't bother exercising the forking AF_UNIX tests on EMX - its
  fork() can't handle the stress.


Index: test_socketserver.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_socketserver.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** test_socketserver.py	12 Feb 2004 17:35:11 -0000	1.9
--- test_socketserver.py	11 Apr 2004 12:03:57 -0000	1.10
***************
*** 95,98 ****
--- 95,111 ----
      else:
          fn = TESTFN + str(pickport())
+         if os.name == 'os2':
+             # AF_UNIX socket names on OS/2 require a specific prefix
+             # which can't include a drive letter and must also use
+             # backslashes as directory separators
+             if fn[1] == ':':
+                 fn = fn[2:]
+             if fn[0] in (os.sep, os.altsep):
+                 fn = fn[1:]
+             fn = os.path.join('\socket', fn)
+             if os.sep == '/':
+                 fn = fn.replace(os.sep, os.altsep)
+             else:
+                 fn = fn.replace(os.altsep, os.sep)
          testfiles.append(fn)
          return fn
***************
*** 136,144 ****
  else:
      class ForkingUnixStreamServer(ForkingMixIn, UnixStreamServer): pass
!     streamservers = [UnixStreamServer, ThreadingUnixStreamServer,
!                      ForkingUnixStreamServer]
      class ForkingUnixDatagramServer(ForkingMixIn, UnixDatagramServer): pass
!     dgramservers = [UnixDatagramServer, ThreadingUnixDatagramServer,
!                     ForkingUnixDatagramServer]
  
  def testall():
--- 149,159 ----
  else:
      class ForkingUnixStreamServer(ForkingMixIn, UnixStreamServer): pass
!     streamservers = [UnixStreamServer, ThreadingUnixStreamServer]
!     if hasattr(os, 'fork') and os.name not in ('os2',):
!         streamservers.append(ForkingUnixStreamServer)
      class ForkingUnixDatagramServer(ForkingMixIn, UnixDatagramServer): pass
!     dgramservers = [UnixDatagramServer, ThreadingUnixDatagramServer]
!     if hasattr(os, 'fork') and os.name not in ('os2',):
!         dgramservers.append(ForkingUnixDatagramServer)
  
  def testall():