← 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

  • Committer: Robert Collins
  • Date: 2006-02-13 21:52:05 UTC
  • mto: (1534.1.22 integration)
  • mto: This revision was merged to the branch mainline in revision 1554.
  • Revision ID: robertc@robertcollins.net-20060213215205-cb3bacc87092a639
Update per review comments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/branch_implementations/test_branch.py
19
19
import os
20
20
import sys
21
21
 
22
 
import bzrlib.branch as branch
 
22
import bzrlib.branch
23
23
import bzrlib.bzrdir as bzrdir
24
24
from bzrlib.branch import Branch, needs_read_lock, needs_write_lock
25
25
from bzrlib.commit import commit
519
519
        t = get_transport(self.get_url())
520
520
        readonly_t = get_transport(self.get_readonly_url())
521
521
        made_branch = self.make_branch('.')
522
 
        self.failUnless(isinstance(made_branch, branch.Branch))
 
522
        self.failUnless(isinstance(made_branch, bzrlib.branch.Branch))
523
523
 
524
524
        # find it via bzrdir opening:
525
525
        opened_control = bzrdir.BzrDir.open(readonly_t.base)
530
530
                        self.branch_format.__class__))
531
531
 
532
532
        # find it via Branch.open
533
 
        opened_branch = branch.Branch.open(readonly_t.base)
 
533
        opened_branch = bzrlib.branch.Branch.open(readonly_t.base)
534
534
        self.failUnless(isinstance(opened_branch, made_branch.__class__))
535
535
        self.assertEqual(made_branch._format.__class__,
536
536
                         opened_branch._format.__class__)
540
540
        except NotImplementedError:
541
541
            return
542
542
        self.assertEqual(self.branch_format,
543
 
                         branch.BranchFormat.find_format(opened_control))
 
543
                         bzrlib.branch.BranchFormat.find_format(opened_control))