/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/per_branch/test_branch.py

Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_branch/test_branch.py
20
20
 
21
21
from breezy import (
22
22
    branch as _mod_branch,
 
23
    bzrbranch as _mod_bzrbranch,
23
24
    controldir,
24
25
    config,
25
26
    delta as _mod_delta,
246
247
        """
247
248
        t = self.get_transport()
248
249
        branch = self.make_branch('bzr.dev')
249
 
        if not isinstance(branch, _mod_branch.BzrBranch):
 
250
        if not isinstance(branch, _mod_bzrbranch.BzrBranch):
250
251
            raise tests.TestNotApplicable("not a bzr branch format")
251
252
        # The nick will be 'bzr.dev', because there is no explicit nick set.
252
253
        self.assertEqual(branch.nick, 'bzr.dev')