/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

  • Committer: Martin Pool
  • Date: 2008-05-22 05:48:22 UTC
  • mfrom: (3407.2.16 controlfiles)
  • mto: This revision was merged to the branch mainline in revision 3448.
  • Revision ID: mbp@sourcefrog.net-20080522054822-lrq17tx62wbfzj8r
merge further LockableFile deprecations

Show diffs side-by-side

added added

removed removed

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