← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/branch_implementations/test_branch.py

Deprecate LockableFiles.controlfilename

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/branch_implementations/test_branch.py
326
326
        # Set the branch nick explicitly.  This will ensure there's a branch
327
327
        # config file in the branch.
328
328
        branch.nick = "Aaron's branch"
329
 
        branch.nick = "Aaron's branch"
330
329
        if not isinstance(branch, remote.RemoteBranch):
331
 
            controlfilename = branch.control_files.controlfilename
332
 
            self.failUnless(t.has(t.relpath(controlfilename("branch.conf"))))
 
330
            self.failUnless(branch._transport.has("branch.conf"))
333
331
        # Because the nick has been set explicitly, the nick is now always
334
332
        # "Aaron's branch", regardless of directory name.
335
333
        self.assertEqual(branch.nick, "Aaron's branch")