Rev 5815: (jameinel) Skip a test that called os.utime(dir) if the filesystem doesn't in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5815 [merge]
revision-id: pqm at pqm.ubuntu.com-20110429115429-bi5nv4kqmyrbtzx0
parent: pqm at pqm.ubuntu.com-20110429110714-wr9f71ea9600lvb6
parent: john at arbash-meinel.com-20110429101438-yoe6dfiutt49aptz
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2011-04-29 11:54:29 +0000
message:
  (jameinel) Skip a test that called os.utime(dir) if the filesystem doesn't
   support it. (John A Meinel)
modified:
  bzrlib/tests/test__dirstate_helpers.py test_dirstate_helper-20070504035751-jsbn00xodv0y1eve-2
=== modified file 'bzrlib/tests/test__dirstate_helpers.py'
--- a/bzrlib/tests/test__dirstate_helpers.py	2011-04-19 13:59:07 +0000
+++ b/bzrlib/tests/test__dirstate_helpers.py	2011-04-29 10:14:38 +0000
@@ -1020,7 +1020,11 @@
                          state._dirblock_state)
         # Change the last-modified time for the directory
         t = time.time() - 100.0
-        os.utime('a', (t, t))
+        try:
+            os.utime('a', (t, t))
+        except OSError:
+            # It looks like Win32 + FAT doesn't allow to change times on a dir.
+            raise tests.TestSkipped("can't update mtime of a dir on FAT")
         saved_packed_stat = entry[1][0][-1]
         self.assertIs(None, self.do_update_entry(state, entry, 'a'))
         # We *do* go ahead and update the information in the dirblocks, but we