Merged revisions 68610,68621-68622,68649 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  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.
........
  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...
........

diff --git a/Lib/test/test_datetime.py b/Lib/test/test_datetime.py
index 89fa5c8e697b36254d6e41ee2d62bdd7cc07e6d5..24ec895cf49d172d1d723622fdf9638db1d07c29 100644 (file)
--- a/Lib/test/test_datetime.py
+++ b/Lib/test/test_datetime.py
@@ -857,9 +857,18 @@ class TestDate(HarmlessMixedComparison, unittest.TestCase):
         self.assertEqual(t.strftime("'%z' '%Z'"), "'' ''")
 
         #make sure that invalid format specifiers are handled correctly
-        self.assertRaises(ValueError, t.strftime, "%e")
-        self.assertRaises(ValueError, t.strftime, "%")
-        self.assertRaises(ValueError, t.strftime, "%#")
+        #self.assertRaises(ValueError, t.strftime, "%e")
+        #self.assertRaises(ValueError, t.strftime, "%")
+        #self.assertRaises(ValueError, t.strftime, "%#")
+
+        #oh well, some systems just ignore those invalid ones.
+        #at least, excercise them to make sure that no crashes
+        #are generated
+        for f in ["%e", "%", "%#"]:
+            try:
+                t.strftime(f)
+            except ValueError:
+                pass
 
         #check that this standard extension works
         t.strftime("%f")

diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index c89a23f8d69cb7ad6f4031128bad979c8a734cf6..2c9d9bff693e9ece0549669d9c0f93ad9ac72b0b 100644 (file)
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -534,8 +534,10 @@ class Win32ErrorTests(unittest.TestCase):
         self.assertRaises(WindowsError, os.utime, test_support.TESTFN, 0)
 
 class TestInvalidFD(unittest.TestCase):
-    singles = ["fchdir", "fdopen", "close", "dup", "fdatasync", "fstat",
+    singles = ["fchdir", "fdopen", "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):
@@ -545,13 +547,16 @@ class TestInvalidFD(unittest.TestCase):
         locals()["test_"+f] = get_single(f)
 
     def test_isatty(self):
-        self.assertEqual(os.isatty(10), False)
+        if hasattr(os, "isatty"):
+            self.assertEqual(os.isatty(10), False)
 
     def test_closerange(self):
-        self.assertEqual(os.closerange(10, 20), None)
+        if hasattr(os, "closerange"):
+            self.assertEqual(os.closerange(10, 20), None)
 
     def test_dup2(self):
-        self.assertRaises(OSError, os.dup2, 10, 20)
+        if hasattr(os, "dup2"):
+            self.assertRaises(OSError, os.dup2, 10, 20)
 
     def test_fchmod(self):
         if hasattr(os, "fchmod"):
@@ -559,28 +564,32 @@ class TestInvalidFD(unittest.TestCase):
 
     def test_fchown(self):
         if hasattr(os, "fchown"):
-            self.assertRaises(OSError, os.fchmod, 10, -1, -1)
+            self.assertRaises(OSError, os.fchown, 10, -1, -1)
 
     def test_fpathconf(self):
         if hasattr(os, "fpathconf"):
-            self.assertRaises(OSError, os.fpathconf, 10, "foo")
+            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(OSError, os.ftruncate, 10, 0)
+            self.assertRaises(IOError, os.ftruncate, 10, 0)
 
     def test_lseek(self):
-        self.assertRaises(OSError, os.lseek, 10, 0, 0)
+        if hasattr(os, "lseek"):
+            self.assertRaises(OSError, os.lseek, 10, 0, 0)
 
     def test_read(self):
-        self.assertRaises(OSError, os.read, 10, 1)
+        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):
-        self.assertRaises(OSError, os.write, 10, " ")
+        if hasattr(os, "write"):
+            self.assertRaises(OSError, os.write, 10, " ")
 
 if sys.platform != 'win32':
     class Win32ErrorTests(unittest.TestCase):