← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Patch Queue Manager
  • Date: 2015-12-17 18:39:00 UTC
  • mfrom: (6606.1.2 fix-float)
  • Revision ID: pqm@pqm.ubuntu.com-20151217183900-0719du2uv1kwu3lc
(vila) Inline testtools private method to fix an issue in xenial (the
 private implementation has changed in an backward incompatible way).
 (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_branch/test_permissions.py
32
32
 
33
33
from bzrlib import tests
34
34
from bzrlib.branch import BzrBranch
35
 
from bzrlib.bzrdir import BzrDir
 
35
from bzrlib.controldir import ControlDir
36
36
from bzrlib.remote import RemoteBranchFormat
37
37
from bzrlib.tests.test_permissions import check_mode_r
38
38
 
126
126
            raise tests.TestNotApplicable('Remote branches have no'
127
127
                                          ' permission logic')
128
128
        self.make_branch_and_tree('.')
129
 
        bzrdir = BzrDir.open('.')
 
129
        bzrdir = ControlDir.open('.')
130
130
        # Monkey patch the transport
131
131
        _orig_stat = bzrdir.transport.stat
132
132
        def null_perms_stat(*args, **kwargs):