← 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: Jelmer Vernooij
  • Date: 2011-03-03 02:28:57 UTC
  • mfrom: (5692 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5693.
  • Revision ID: jelmer@samba.org-20110303022857-pe8967n481mlengo
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

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