/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

First attempt to merge .dev and resolve the conflicts (but tests are 
failing)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/branch_implementations/test_permissions.py
1
 
# Copyright (C) 2005 by Canonical Ltd
2
 
# -*- coding: utf-8 -*-
 
1
# Copyright (C) 2005, 2008 Canonical Ltd
3
2
#
4
3
# This program is free software; you can redistribute it and/or modify
5
4
# it under the terms of the GNU General Public License as published by
35
34
from bzrlib.branch import Branch
36
35
from bzrlib.bzrdir import BzrDir
37
36
from bzrlib.lockable_files import LockableFiles
 
37
from bzrlib.remote import RemoteBranchFormat
38
38
from bzrlib.tests import TestCaseWithTransport, TestSkipped
39
39
from bzrlib.tests.test_permissions import chmod_r, check_mode_r
40
40
from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer
45
45
class TestPermissions(TestCaseWithTransport):
46
46
 
47
47
    def test_new_branch(self):
 
48
        if isinstance(self.branch_format, RemoteBranchFormat):
 
49
            # Remote branch format have no permission logic in them; there's
 
50
            # nothing to test here.
 
51
            return
48
52
        if sys.platform == 'win32':
49
53
            raise TestSkipped('chmod has no effect on win32')
50
54
        # also, these are BzrBranch format specific things..
52
56
        mode = stat.S_IMODE(os.stat('a').st_mode)
53
57
        t = self.make_branch_and_tree('.')
54
58
        b = t.branch
 
59
        self.assertEqualMode(mode, b.bzrdir._get_dir_mode())
 
60
        self.assertEqualMode(mode & ~07111, b.bzrdir._get_file_mode())
55
61
        self.assertEqualMode(mode, b.control_files._dir_mode)
56
62
        self.assertEqualMode(mode & ~07111, b.control_files._file_mode)
57
63
 
58
64
        os.mkdir('b')
59
65
        os.chmod('b', 02777)
60
66
        b = self.make_branch('b')
 
67
        self.assertEqualMode(02777, b.bzrdir._get_dir_mode())
 
68
        self.assertEqualMode(00666, b.bzrdir._get_file_mode())
61
69
        self.assertEqualMode(02777, b.control_files._dir_mode)
62
70
        self.assertEqualMode(00666, b.control_files._file_mode)
63
71
        check_mode_r(self, 'b/.bzr', 00666, 02777)
65
73
        os.mkdir('c')
66
74
        os.chmod('c', 02750)
67
75
        b = self.make_branch('c')
 
76
        self.assertEqualMode(02750, b.bzrdir._get_dir_mode())
 
77
        self.assertEqualMode(00640, b.bzrdir._get_file_mode())
68
78
        self.assertEqualMode(02750, b.control_files._dir_mode)
69
79
        self.assertEqualMode(00640, b.control_files._file_mode)
70
80
        check_mode_r(self, 'c/.bzr', 00640, 02750)
72
82
        os.mkdir('d')
73
83
        os.chmod('d', 0700)
74
84
        b = self.make_branch('d')
 
85
        self.assertEqualMode(0700, b.bzrdir._get_dir_mode())
 
86
        self.assertEqualMode(0600, b.bzrdir._get_file_mode())
75
87
        self.assertEqualMode(0700, b.control_files._dir_mode)
76
88
        self.assertEqualMode(0600, b.control_files._file_mode)
77
89
        check_mode_r(self, 'd/.bzr', 00600, 00700)