← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test__dirstate_helpers.py

  • Committer: Jelmer Vernooij
  • Date: 2011-05-04 20:03:08 UTC
  • mfrom: (5824 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5828.
  • Revision ID: jelmer@samba.org-20110504200308-7dzetv0igs4gh5p2
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test__dirstate_helpers.py
1020
1020
                         state._dirblock_state)
1021
1021
        # Change the last-modified time for the directory
1022
1022
        t = time.time() - 100.0
1023
 
        os.utime('a', (t, t))
 
1023
        try:
 
1024
            os.utime('a', (t, t))
 
1025
        except OSError:
 
1026
            # It looks like Win32 + FAT doesn't allow to change times on a dir.
 
1027
            raise tests.TestSkipped("can't update mtime of a dir on FAT")
1024
1028
        saved_packed_stat = entry[1][0][-1]
1025
1029
        self.assertIs(None, self.do_update_entry(state, entry, 'a'))
1026
1030
        # We *do* go ahead and update the information in the dirblocks, but we