[Python-checkins] r57759 - in python/branches/release25-maint: Lib/test/test_os.py Misc/NEWS

[martin.v.loewis]

Author: martin.v.loewis
Date: Thu Aug 30 20:58:29 2007
New Revision: 57759

Modified:
   python/branches/release25-maint/Lib/test/test_os.py
   python/branches/release25-maint/Misc/NEWS
Log:
Bug #1709599: Run test_1565150 only if the file system is NTFS.

Modified: python/branches/release25-maint/Lib/test/test_os.py
==============================================================================
--- python/branches/release25-maint/Lib/test/test_os.py	(original)
+++ python/branches/release25-maint/Lib/test/test_os.py	Thu Aug 30 20:58:29 2007
@@ -226,10 +226,20 @@
     # Restrict test to Win32, since there is no guarantee other
     # systems support centiseconds
     if sys.platform == 'win32':
-        def test_1565150(self):
-            t1 = 1159195039.25
-            os.utime(self.fname, (t1, t1))
-            self.assertEquals(os.stat(self.fname).st_mtime, t1)
+        def get_file_system(path):
+            import os
+            root = os.path.splitdrive(os.path.realpath("."))[0] + '\\'
+            import ctypes
+            kernel32 = ctypes.windll.kernel32
+            buf = ctypes.create_string_buffer("", 100)
+            if kernel32.GetVolumeInformationA(root, None, 0, None, None, None, buf, len(buf)):
+                return buf.value
+
+        if get_file_system(test_support.TESTFN) == "NTFS":
+            def test_1565150(self):
+                t1 = 1159195039.25
+                os.utime(self.fname, (t1, t1))
+                self.assertEquals(os.stat(self.fname).st_mtime, t1)
 
         def test_1686475(self):
             # Verify that an open file can be stat'ed

Modified: python/branches/release25-maint/Misc/NEWS
==============================================================================
--- python/branches/release25-maint/Misc/NEWS	(original)
+++ python/branches/release25-maint/Misc/NEWS	Thu Aug 30 20:58:29 2007
@@ -26,6 +26,8 @@
 Library
 -------
 
+- Bug #1709599: Run test_1565150 only if the file system is NTFS.
+
 - When encountering a password-protected robots.txt file the RobotFileParser
   no longer prompts interactively for a username and password (bug 813986).