← 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: Aaron Bentley
  • Date: 2007-02-06 14:52:16 UTC
  • mfrom: (2266 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2268.
  • Revision ID: abentley@panoramicfeedback.com-20070206145216-fcpi8o3ufvuzwbp9
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_permissions.py
47
47
 
48
48
def chmod_r(base, file_mode, dir_mode):
49
49
    """Recursively chmod from a base directory"""
 
50
    assert os.path.isdir(base)
50
51
    os.chmod(base, dir_mode)
51
52
    for root, dirs, files in os.walk(base):
52
53
        for d in dirs:
66
67
    :param dir_mode: The mode for all directories
67
68
    :param include_base: If false, only check the subdirectories
68
69
    """
 
70
    assert os.path.isdir(base)
69
71
    t = get_transport(".")
70
72
    if include_base:
71
73
        test.assertTransportMode(t, base, dir_mode)
104
106
        b = t.branch
105
107
        self.assertEqualMode(0755, b.control_files._dir_mode)
106
108
        self.assertEqualMode(0644, b.control_files._file_mode)
107
 
        self.assertEqualMode(0755, b.bzrdir._get_dir_mode())
108
 
        self.assertEqualMode(0644, b.bzrdir._get_file_mode())
109
109
 
110
110
        # Modifying a file shouldn't break the permissions
111
111
        open('a', 'wb').write('foo2\n')
126
126
        b = t.branch
127
127
        self.assertEqualMode(0775, b.control_files._dir_mode)
128
128
        self.assertEqualMode(0664, b.control_files._file_mode)
129
 
        self.assertEqualMode(0775, b.bzrdir._get_dir_mode())
130
 
        self.assertEqualMode(0664, b.bzrdir._get_file_mode())
131
129
 
132
130
        open('a', 'wb').write('foo3\n')
133
131
        t.commit('foo3')
146
144
        b = t.branch
147
145
        self.assertEqualMode(02775, b.control_files._dir_mode)
148
146
        self.assertEqualMode(0664, b.control_files._file_mode)
149
 
        self.assertEqualMode(02775, b.bzrdir._get_dir_mode())
150
 
        self.assertEqualMode(0664, b.bzrdir._get_file_mode())
151
147
 
152
148
        open('a', 'wb').write('foo4\n')
153
149
        t.commit('foo4')
158
154
        t.commit('new d')
159
155
        check_mode_r(self, '.bzr', 0664, 02775)
160
156
 
 
157
    def test_disable_set_mode(self):
 
158
        # TODO: jam 20051215 Ultimately, this test should probably test that
 
159
        #                    extra chmod calls aren't being made
 
160
        try:
 
161
            transport = get_transport(self.get_url())
 
162
            transport.put_bytes('my-lock', '')
 
163
            lockable = LockableFiles(transport, 'my-lock', TransportLock)
 
164
            self.assertNotEqual(None, lockable._dir_mode)
 
165
            self.assertNotEqual(None, lockable._file_mode)
 
166
 
 
167
            LockableFiles._set_dir_mode = False
 
168
            transport = get_transport('.')
 
169
            lockable = LockableFiles(transport, 'my-lock', TransportLock)
 
170
            self.assertEqual(None, lockable._dir_mode)
 
171
            self.assertNotEqual(None, lockable._file_mode)
 
172
 
 
173
            LockableFiles._set_file_mode = False
 
174
            transport = get_transport('.')
 
175
            lockable = LockableFiles(transport, 'my-lock', TransportLock)
 
176
            self.assertEqual(None, lockable._dir_mode)
 
177
            self.assertEqual(None, lockable._file_mode)
 
178
 
 
179
            LockableFiles._set_dir_mode = True
 
180
            transport = get_transport('.')
 
181
            lockable = LockableFiles(transport, 'my-lock', TransportLock)
 
182
            self.assertNotEqual(None, lockable._dir_mode)
 
183
            self.assertEqual(None, lockable._file_mode)
 
184
 
 
185
            LockableFiles._set_file_mode = True
 
186
            transport = get_transport('.')
 
187
            lockable = LockableFiles(transport, 'my-lock', TransportLock)
 
188
            self.assertNotEqual(None, lockable._dir_mode)
 
189
            self.assertNotEqual(None, lockable._file_mode)
 
190
        finally:
 
191
            LockableFiles._set_dir_mode = True
 
192
            LockableFiles._set_file_mode = True
 
193
 
161
194
 
162
195
class TestSftpPermissions(TestCaseWithSFTPServer):
163
196
 
186
219
        b_local = t.branch
187
220
        self.assertEqualMode(0755, b_local.control_files._dir_mode)
188
221
        self.assertEqualMode(0644, b_local.control_files._file_mode)
189
 
        self.assertEqualMode(0755, b_local.bzrdir._get_dir_mode())
190
 
        self.assertEqualMode(0644, b_local.bzrdir._get_file_mode())
191
222
 
192
223
        os.mkdir('sftp')
193
224
        sftp_url = self.get_url('sftp')
201
232
        b_sftp = Branch.open(sftp_url)
202
233
        self.assertEqualMode(0755, b_sftp.control_files._dir_mode)
203
234
        self.assertEqualMode(0644, b_sftp.control_files._file_mode)
204
 
        self.assertEqualMode(0755, b_sftp.bzrdir._get_dir_mode())
205
 
        self.assertEqualMode(0644, b_sftp.bzrdir._get_file_mode())
206
235
 
207
236
        open('local/a', 'wb').write('foo2\n')
208
237
        t_local.commit('foo2')
224
253
        b_sftp = Branch.open(sftp_url)
225
254
        self.assertEqualMode(0775, b_sftp.control_files._dir_mode)
226
255
        self.assertEqualMode(0664, b_sftp.control_files._file_mode)
227
 
        self.assertEqualMode(0775, b_sftp.bzrdir._get_dir_mode())
228
 
        self.assertEqualMode(0664, b_sftp.bzrdir._get_file_mode())
229
256
 
230
257
        open('local/a', 'wb').write('foo3\n')
231
258
        t_local.commit('foo3')
255
282
            t.put_bytes('b', 'txt', mode=0666)
256
283
            self.assertTransportMode(t, 'b', 0666)
257
284
 
258
 
            t._get_sftp().mkdir('c', mode=0777)
 
285
            t._sftp.mkdir('c', mode=0777)
259
286
            self.assertTransportMode(t, 'c', 0777 &~umask)
260
287
 
261
288
            t.mkdir('d', mode=0777)