← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_permissions.py

Branch now uses BzrDir reasonably sanely.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_permissions.py
36
36
from StringIO import StringIO
37
37
 
38
38
from bzrlib.branch import Branch
 
39
from bzrlib.bzrdir import BzrDir
39
40
from bzrlib.lockable_files import LockableFiles
40
41
from bzrlib.tests import TestCaseWithTransport, TestSkipped
41
42
from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer
207
208
 
208
209
        os.mkdir('b')
209
210
        os.chmod('b', 02777)
210
 
        b = Branch.create('b')
 
211
        b = BzrDir.create('b').create_branch()
211
212
        assertEqualMode(self, 02777, b.control_files._dir_mode)
212
213
        assertEqualMode(self, 00666, b.control_files._file_mode)
213
214
        check_mode_r(self, 'b/.bzr', 00666, 02777)
214
215
 
215
216
        os.mkdir('c')
216
217
        os.chmod('c', 02750)
217
 
        b = Branch.create('c')
 
218
        b = BzrDir.create('c').create_branch()
218
219
        assertEqualMode(self, 02750, b.control_files._dir_mode)
219
220
        assertEqualMode(self, 00640, b.control_files._file_mode)
220
221
        check_mode_r(self, 'c/.bzr', 00640, 02750)
221
222
 
222
223
        os.mkdir('d')
223
224
        os.chmod('d', 0700)
224
 
        b = Branch.create('d')
 
225
        b = BzrDir.create('d').create_branch()
225
226
        assertEqualMode(self, 0700, b.control_files._dir_mode)
226
227
        assertEqualMode(self, 0600, b.control_files._file_mode)
227
228
        check_mode_r(self, 'd/.bzr', 00600, 0700)
260
261
 
261
262
        os.mkdir('sftp')
262
263
        sftp_url = self.get_remote_url('sftp')
263
 
        b_sftp = Branch.create(sftp_url)
 
264
        b_sftp = BzrDir.create_branch_and_repo(sftp_url)
264
265
 
265
266
        b_sftp.pull(b_local)
266
267
        del b_sftp