/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 breezy/tests/per_branch/test_permissions.py

  • Committer: Jelmer Vernooij
  • Date: 2017-06-10 16:40:42 UTC
  • mfrom: (6653.6.7 rename-controldir)
  • mto: This revision was merged to the branch mainline in revision 6690.
  • Revision ID: jelmer@jelmer.uk-20170610164042-zrxqgy2htyduvke2
Merge rename-controldir branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_branch/test_permissions.py
67
67
            raise tests.TestNotApplicable(
68
68
                "Only applicable to bzr branches")
69
69
        b = t.branch
70
 
        self.assertEqualMode(mode, b.bzrdir._get_dir_mode())
71
 
        self.assertEqualMode(mode & ~0o7111, b.bzrdir._get_file_mode())
 
70
        self.assertEqualMode(mode, b.controldir._get_dir_mode())
 
71
        self.assertEqualMode(mode & ~0o7111, b.controldir._get_file_mode())
72
72
        self.assertEqualMode(mode, b.control_files._dir_mode)
73
73
        self.assertEqualMode(mode & ~0o7111, b.control_files._file_mode)
74
74
 
75
75
        os.mkdir('d')
76
76
        os.chmod('d', 0o700)
77
77
        b = self.make_branch('d')
78
 
        self.assertEqualMode(0o700, b.bzrdir._get_dir_mode())
79
 
        self.assertEqualMode(0o600, b.bzrdir._get_file_mode())
 
78
        self.assertEqualMode(0o700, b.controldir._get_dir_mode())
 
79
        self.assertEqualMode(0o600, b.controldir._get_file_mode())
80
80
        self.assertEqualMode(0o700, b.control_files._dir_mode)
81
81
        self.assertEqualMode(0o600, b.control_files._file_mode)
82
82
        check_mode_r(self, 'd/.bzr', 0o0600, 0o0700)
103
103
        os.mkdir('b')
104
104
        os.chmod('b', 0o2777)
105
105
        b = self.make_branch('b')
106
 
        self.assertEqualMode(0o2777, b.bzrdir._get_dir_mode())
107
 
        self.assertEqualMode(0o0666, b.bzrdir._get_file_mode())
 
106
        self.assertEqualMode(0o2777, b.controldir._get_dir_mode())
 
107
        self.assertEqualMode(0o0666, b.controldir._get_file_mode())
108
108
        self.assertEqualMode(0o2777, b.control_files._dir_mode)
109
109
        self.assertEqualMode(0o0666, b.control_files._file_mode)
110
110
        check_mode_r(self, 'b/.bzr', 0o0666, 0o2777)
112
112
        os.mkdir('c')
113
113
        os.chmod('c', 0o2750)
114
114
        b = self.make_branch('c')
115
 
        self.assertEqualMode(0o2750, b.bzrdir._get_dir_mode())
116
 
        self.assertEqualMode(0o0640, b.bzrdir._get_file_mode())
 
115
        self.assertEqualMode(0o2750, b.controldir._get_dir_mode())
 
116
        self.assertEqualMode(0o0640, b.controldir._get_file_mode())
117
117
        self.assertEqualMode(0o2750, b.control_files._dir_mode)
118
118
        self.assertEqualMode(0o0640, b.control_files._file_mode)
119
119
        check_mode_r(self, 'c/.bzr', 0o0640, 0o2750)