Merged revisions 68547,68607,68610,68618,68621-68622,68649,68722 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r68547 | kristjan.jonsson | 2009-01-12 12:09:27 -0600 (Mon, 12 Jan 2009) | 1 line
Add tests for invalid format specifiers in strftime, and for handling of invalid file descriptors in the os module.
........
r68607 | kristjan.jonsson | 2009-01-14 04:50:57 -0600 (Wed, 14 Jan 2009) | 2 lines
Re-enable all tests for windows platforms.
Also, explicitly connect to the IPV4 address. On windows platforms supporting AF_INET6, the SocketProxy would connect using socket.create_connection('localhost', port) which would cycle through all address families and try to connect. It would try connecting using AF_INET6 first and this would cause a delay of up to a second.
........
r68610 | kristjan.jonsson | 2009-01-15 03:09:13 -0600 (Thu, 15 Jan 2009) | 3 lines
Fix recently introduced test cases.
For datetime, gentoo didn't seem to mind the %e format for strftime. So, we just excercise those instead making sure that we don't crash.
For test_os, two cases were incorrect.
........
r68618 | kristjan.jonsson | 2009-01-15 11:20:21 -0600 (Thu, 15 Jan 2009) | 1 line
Issue 4929: Handle socket errors when receiving
........
r68621 | kristjan.jonsson | 2009-01-15 16:40:03 -0600 (Thu, 15 Jan 2009) | 1 line
Fix two test cases in test_os. ftruncate raises IOError unlike all the others which raise OSError. And close() on some platforms doesn't complain when given an invalid file descriptor.
........
r68622 | kristjan.jonsson | 2009-01-15 16:46:26 -0600 (Thu, 15 Jan 2009) | 1 line
Make all the invalid fd tests for os subject to the function being available.
........
r68649 | benjamin.peterson | 2009-01-16 22:39:05 -0600 (Fri, 16 Jan 2009) | 1 line
trying to find some fpathconf() settings that all unixs support...
........
r68722 | kristjan.jonsson | 2009-01-18 04:58:44 -0600 (Sun, 18 Jan 2009) | 1 line
issue 4293: make test_capi.py more robutst, it times out on some platforms, presumably waiting for threads. Lower the thread count to 16.
........
diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index 4897aaf..7373334 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -587,6 +587,64 @@
def test_chmod(self):
self.assertRaises(WindowsError, os.utime, support.TESTFN, 0)
+class TestInvalidFD(unittest.TestCase):
+ singles = ["fchdir", "dup", "fdatasync", "fstat",
+ "fstatvfs", "fsync", "tcgetpgrp", "ttyname"]
+ #singles.append("close")
+ #We omit close because it doesn'r raise an exception on some platforms
+ def get_single(f):
+ def helper(self):
+ if getattr(os, f, None):
+ self.assertRaises(OSError, getattr(os, f), 10)
+ return helper
+ for f in singles:
+ locals()["test_"+f] = get_single(f)
+
+ def test_isatty(self):
+ if hasattr(os, "isatty"):
+ self.assertEqual(os.isatty(10), False)
+
+ def test_closerange(self):
+ if hasattr(os, "closerange"):
+ self.assertEqual(os.closerange(10, 20), None)
+
+ def test_dup2(self):
+ if hasattr(os, "dup2"):
+ self.assertRaises(OSError, os.dup2, 10, 20)
+
+ def test_fchmod(self):
+ if hasattr(os, "fchmod"):
+ self.assertRaises(OSError, os.fchmod, 10, 0)
+
+ def test_fchown(self):
+ if hasattr(os, "fchown"):
+ self.assertRaises(OSError, os.fchown, 10, -1, -1)
+
+ def test_fpathconf(self):
+ if hasattr(os, "fpathconf"):
+ self.assertRaises(OSError, os.fpathconf, 10, "PC_NAME_MAX")
+
+ #this is a weird one, it raises IOError unlike the others
+ def test_ftruncate(self):
+ if hasattr(os, "ftruncate"):
+ self.assertRaises(IOError, os.ftruncate, 10, 0)
+
+ def test_lseek(self):
+ if hasattr(os, "lseek"):
+ self.assertRaises(OSError, os.lseek, 10, 0, 0)
+
+ def test_read(self):
+ if hasattr(os, "read"):
+ self.assertRaises(OSError, os.read, 10, 1)
+
+ def test_tcsetpgrpt(self):
+ if hasattr(os, "tcsetpgrp"):
+ self.assertRaises(OSError, os.tcsetpgrp, 10, 0)
+
+ def test_write(self):
+ if hasattr(os, "write"):
+ self.assertRaises(OSError, os.write, 10, b" ")
+
if sys.platform != 'win32':
class Win32ErrorTests(unittest.TestCase):
pass
@@ -601,7 +659,8 @@
DevNullTests,
URandomTests,
ExecTests,
- Win32ErrorTests
+ Win32ErrorTests,
+ TestInvalidFD
)
if __name__ == "__main__":