← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_branch/test_permissions.py

merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_branch/test_permissions.py
90
90
                                          ' permission logic')
91
91
        if sys.platform == 'win32':
92
92
            raise tests.TestNotApplicable('chmod has no effect on win32')
93
 
        elif sys.platform == 'darwin' or sys.platform.startswith('freebsd'):
94
 
            # OS X (and FreeBSD) create temp dirs with the 'wheel' group, which
95
 
            # users are not likely to be in, and this prevents us from setting
96
 
            # the sgid bit
 
93
        elif sys.platform == 'darwin' or 'freebsd' in sys.platform:
 
94
            # FreeBSD-based platforms create temp dirs with the 'wheel' group,
 
95
            # which users are not likely to be in, and this prevents us
 
96
            # from setting the sgid bit
97
97
            os.chown(self.test_dir, os.getuid(), os.getgid())
98
98
        # also, these are BzrBranch format specific things..
99
99
        t = self.make_branch_and_tree('.')