← 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: Jelmer Vernooij
  • Date: 2012-04-16 11:08:11 UTC
  • mfrom: (6521 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6522.
  • Revision ID: jelmer@samba.org-20120416110811-0y996ihqy9o2bb1t
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_permissions.py
35
35
 
36
36
from bzrlib import urlutils
37
37
from bzrlib.branch import Branch
38
 
from bzrlib.bzrdir import BzrDir
 
38
from bzrlib.controldir import ControlDir
39
39
from bzrlib.tests import TestCaseWithTransport, TestSkipped
40
40
from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer
41
41
from bzrlib.workingtree import WorkingTree
199
199
 
200
200
        os.mkdir('sftp')
201
201
        sftp_url = self.get_url('sftp')
202
 
        b_sftp = BzrDir.create_branch_and_repo(sftp_url)
 
202
        b_sftp = ControlDir.create_branch_and_repo(sftp_url)
203
203
 
204
204
        b_sftp.pull(b_local)
205
205
        del b_sftp