[Python-checkins] python/dist/src/Lib/test regrtest.py, 1.165.2.2, 1.165.2.3 test_ioctl.py, 1.2, 1.2.18.1

Wed Sep 14 20:15:06 CEST 2005

Update of /cvsroot/python/python/dist/src/Lib/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24791/Lib/test
Modified Files:
 Tag: release24-maint
	regrtest.py test_ioctl.py 
Log Message:
- Changes donated by Elemental Security to make it work on AIX 5.3
 with IBM's 64-bit compiler (SF patch #1284289). This also closes SF
 bug #105470: test_pwd fails on 64bit system (Opteron).
Index: regrtest.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/regrtest.py,v
retrieving revision 1.165.2.2
retrieving revision 1.165.2.3
diff -u -d -r1.165.2.2 -r1.165.2.3

--- regrtest.py	3 Jun 2005 14:10:49 -0000	1.165.2.2
+++ regrtest.py	14 Sep 2005 18:15:02 -0000	1.165.2.3
@@ -1066,6 +1066,34 @@
 test_winreg
 test_winsound
 """,
+ 'aix5':
+ """
+ test_aepack
+ test_al
+ test_applesingle
+ test_bsddb
+ test_bsddb185
+ test_bsddb3
+ test_bz2
+ test_cd
+ test_cl
+ test_dl
+ test_gdbm
+ test_gl
+ test_gzip
+ test_imgfile
+ test_linuxaudiodev
+ test_macfs
+ test_macostools
+ test_nis
+ test_ossaudiodev
+ test_sunaudiodev
+ test_tcl
+ test_winreg
+ test_winsound
+ test_zipimport
+ test_zlib
+ """,
 }
 _expectations['freebsd5'] = _expectations['freebsd4']
 _expectations['freebsd6'] = _expectations['freebsd4']
Index: test_ioctl.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_ioctl.py,v
retrieving revision 1.2
retrieving revision 1.2.18.1
diff -u -d -r1.2 -r1.2.18.1
--- test_ioctl.py	20 Mar 2003 04:33:16 -0000	1.2
+++ test_ioctl.py	14 Sep 2005 18:15:02 -0000	1.2.18.1
@@ -1,5 +1,5 @@
 import unittest
-from test_support import TestSkipped, run_unittest
+from test.test_support import TestSkipped, run_unittest
 import os, struct
 try:
 import fcntl, termios
@@ -16,19 +16,23 @@
 
 class IoctlTests(unittest.TestCase):
 def test_ioctl(self):
- pgrp = os.getpgrp()
+ # If this process has been put into the background, TIOCGPGRP returns
+ # the session ID instead of the process group id.
+ ids = (os.getpgrp(), os.getsid(0))
 tty = open("/dev/tty", "r")
 r = fcntl.ioctl(tty, termios.TIOCGPGRP, " ")
- self.assertEquals(pgrp, struct.unpack("i", r)[0])
+ rpgrp = struct.unpack("i", r)[0]
+ self.assert_(rpgrp in ids, "%s not in %s" % (rpgrp, ids))
 
 def test_ioctl_mutate(self):
 import array
 buf = array.array('i', [0])
- pgrp = os.getpgrp()
+ ids = (os.getpgrp(), os.getsid(0))
 tty = open("/dev/tty", "r")
 r = fcntl.ioctl(tty, termios.TIOCGPGRP, buf, 1)
+ rpgrp = buf[0]
 self.assertEquals(r, 0)
- self.assertEquals(pgrp, buf[0])
+ self.assert_(rpgrp in ids, "%s not in %s" % (rpgrp, ids))
 
 def test_main():
 run_unittest(IoctlTests)
