[Python-checkins] CVS: python/dist/src/Lib/test test_fcntl.py,1.20,1.21 test_longexp.py,1.3,1.4

[Andrew I MacIntyre]

Update of /cvsroot/python/python/dist/src/Lib/test
In directory usw-pr-cvs1:/tmp/cvs-serv28705/dist/src/Lib/test

Modified Files:
	test_fcntl.py test_longexp.py 
Log Message:
OS/2 EMX port Library and regression test changes:
  Lib/
    os.py
    os2emxpath.py   // added - OS/2 EMX specific path manipulation routines
    popen2.py
    site.py
  Lib/test/
    test_fcntl.py
    test_longexp.py


Index: test_fcntl.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_fcntl.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** test_fcntl.py	5 Dec 2001 23:27:32 -0000	1.20
--- test_fcntl.py	24 Feb 2002 05:32:32 -0000	1.21
***************
*** 1,4 ****
--- 1,5 ----
  #! /usr/bin/env python
  """Test program for the fcntl C module.
+    OS/2+EMX doesn't support the file locking operations.
     Roger E. Masse
  """
***************
*** 24,32 ****
  elif sys.platform in ['aix3', 'aix4', 'hp-uxB', 'unixware7']:
      lockdata = struct.pack('hhlllii', fcntl.F_WRLCK, 0, 0, 0, 0, 0, 0)
  else:
      lockdata = struct.pack('hh'+start_len+'hh', fcntl.F_WRLCK, 0, 0, 0, 0, 0)
! if verbose:
!     print 'struct.pack: ', `lockdata`
! 
  
  # the example from the library docs
--- 25,35 ----
  elif sys.platform in ['aix3', 'aix4', 'hp-uxB', 'unixware7']:
      lockdata = struct.pack('hhlllii', fcntl.F_WRLCK, 0, 0, 0, 0, 0, 0)
+ elif sys.platform in ['os2emx']:
+     lockdata = None
  else:
      lockdata = struct.pack('hh'+start_len+'hh', fcntl.F_WRLCK, 0, 0, 0, 0, 0)
! if lockdata:
!     if verbose:
!         print 'struct.pack: ', `lockdata`
  
  # the example from the library docs
***************
*** 36,42 ****
      print 'Status from fnctl with O_NONBLOCK: ', rv
  
! rv = fcntl.fcntl(f.fileno(), fcntl.F_SETLKW, lockdata)
! if verbose:
!     print 'String from fcntl with F_SETLKW: ', `rv`
  
  f.close()
--- 39,46 ----
      print 'Status from fnctl with O_NONBLOCK: ', rv
  
! if sys.platform not in ['os2emx']:
!     rv = fcntl.fcntl(f.fileno(), fcntl.F_SETLKW, lockdata)
!     if verbose:
!         print 'String from fcntl with F_SETLKW: ', `rv`
  
  f.close()
***************
*** 48,52 ****
  rv = fcntl.fcntl(f, fcntl.F_SETFL, os.O_NONBLOCK)
  
! rv = fcntl.fcntl(f, fcntl.F_SETLKW, lockdata)
  
  f.close()
--- 52,57 ----
  rv = fcntl.fcntl(f, fcntl.F_SETFL, os.O_NONBLOCK)
  
! if sys.platform not in ['os2emx']:
!     rv = fcntl.fcntl(f, fcntl.F_SETLKW, lockdata)
  
  f.close()

Index: test_longexp.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_longexp.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** test_longexp.py	23 Oct 2000 17:22:07 -0000	1.3
--- test_longexp.py	24 Feb 2002 05:32:32 -0000	1.4
***************
*** 1,4 ****
  REPS = 65580
  
! l = eval("[" + "2," * REPS + "]")
! print len(l)
--- 1,12 ----
+ # this test has a malloc problem on OS/2+EMX, so skip test in that environment
+ 
+ import sys
+ from test_support import TestFailed
+ 
  REPS = 65580
  
! if sys.platform == "os2emx":
!     raise TestFailed, "OS/2+EMX port has malloc problems with long expressions"
! else:
!     l = eval("[" + "2," * REPS + "]")
!     print len(l)