← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_foreign.py

  • Committer: Andrew Bennetts
  • Date: 2010-03-11 04:33:41 UTC
  • mfrom: (4797.33.4 2.1)
  • mto: This revision was merged to the branch mainline in revision 5082.
  • Revision ID: andrew.bennetts@canonical.com-20100311043341-rzdik83fnactjsxs
Merge lp:bzr/2.1, including fixes for #496813, #526211, #526353.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_foreign.py
171
171
        super(DummyForeignVcsBranchFormat, self).__init__()
172
172
        self._matchingbzrdir = DummyForeignVcsDirFormat()
173
173
 
174
 
    def open(self, a_bzrdir, name=None, _found=False):
 
174
    def open(self, a_bzrdir, _found=False):
175
175
        if not _found:
176
176
            raise NotImplementedError
177
177
        try:
178
 
            transport = a_bzrdir.get_branch_transport(None, name=name)
 
178
            transport = a_bzrdir.get_branch_transport(None)
179
179
            control_files = lockable_files.LockableFiles(transport, 'lock',
180
180
                                                         lockdir.LockDir)
181
181
            return DummyForeignVcsBranch(_format=self,