~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/bzrdir_implementations/test_bzrdir.py

  • Committer: Robert Collins
  • Date: 2009-02-13 00:52:18 UTC
  • mto: This revision was merged to the branch mainline in revision 4012.
  • Revision ID: robertc@robertcollins.net-20090213005218-yxrgiq7j1du2vldm
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.

Show diffs side-by-side

added added

removed removed

Lines of Context:
58
58
from bzrlib.transport import get_transport
59
59
from bzrlib.transport.local import LocalTransport
60
60
from bzrlib.upgrade import upgrade
61
 
from bzrlib.remote import RemoteBzrDir
 
61
from bzrlib.remote import RemoteBzrDir, RemoteRepository
62
62
from bzrlib.repofmt import weaverepo
63
63
 
64
64
 
558
558
        target_repo = target_bzrdir.open_repository()
559
559
        source_branch = bzrlib.branch.Branch.open(
560
560
            self.get_vfs_only_url('source'))
 
561
        if isinstance(target_repo, RemoteRepository):
 
562
            target_repo._ensure_real()
 
563
            target_repo = target_repo._real_repository
561
564
        self.assertEqual(target_repo._format, source_branch.repository._format)
562
565
 
563
566
    def test_revert_inventory(self):