/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 breezy/tests/test_foreign.py

  • Committer: Jelmer Vernooij
  • Date: 2017-06-10 00:06:46 UTC
  • mfrom: (6673 work)
  • mto: This revision was merged to the branch mainline in revision 6675.
  • Revision ID: jelmer@jelmer.uk-20170610000646-xj6jh277lo4xuo10
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_foreign.py
20
20
 
21
21
from .. import (
22
22
    branch,
 
23
    bzrbranch,
23
24
    bzrdir,
24
25
    controldir,
25
26
    errors,
88
89
        return "%s|%s|%s" % foreign_revid
89
90
 
90
91
 
91
 
class DummyForeignVcsBranch(branch.BzrBranch6,foreign.ForeignBranch):
 
92
class DummyForeignVcsBranch(bzrbranch.BzrBranch6,foreign.ForeignBranch):
92
93
    """A Dummy VCS Branch."""
93
94
 
94
95
    @property
102
103
        self.bzrdir = a_bzrdir
103
104
        foreign.ForeignBranch.__init__(self,
104
105
            DummyForeignVcsMapping(DummyForeignVcs()))
105
 
        branch.BzrBranch6.__init__(self, _format, _control_files, a_bzrdir,
 
106
        bzrbranch.BzrBranch6.__init__(self, _format, _control_files, a_bzrdir,
106
107
            *args, **kwargs)
107
108
 
108
109
    def _get_checkout_format(self, lightweight=False):
230
231
        return result
231
232
 
232
233
 
233
 
class DummyForeignVcsBranchFormat(branch.BzrBranchFormat6):
 
234
class DummyForeignVcsBranchFormat(bzrbranch.BzrBranchFormat6):
234
235
 
235
236
    @classmethod
236
237
    def get_format_string(cls):