← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_permissions.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-03-02 08:49:07 UTC
  • mfrom: (5067.1.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20100302084907-z4r0yoa4ldspjz82
(vila) Resolve --take-this or --take-other correctly rename kept file

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_permissions.py
140
140
    def test_new_files_group_sticky_bit(self):
141
141
        if sys.platform == 'win32':
142
142
            raise TestSkipped('chmod has no effect on win32')
143
 
        elif sys.platform == 'darwin':
144
 
            # OS X creates temp dirs with the 'wheel' group, which users are
145
 
            # not likely to be in, and this prevents us from setting the sgid
146
 
            # bit
 
143
        elif sys.platform == 'darwin' or sys.platform.startswith('freebsd'):
 
144
            # OS X (and FreeBSD) create temp dirs with the 'wheel' group, which
 
145
            # users are not likely to be in, and this prevents us from setting
 
146
            # the sgid bit
147
147
            os.chown(self.test_dir, os.getuid(), os.getgid())
148
148
 
149
149
        t = self.make_branch_and_tree('.')