/breezy/unstable

To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy/unstable

« back to all changes in this revision

Viewing changes to breezy/tests/blackbox/test_exceptions.py

Merge trunk, address review comments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
20
20
import re
21
21
 
22
22
from breezy import (
 
23
    bzr,
23
24
    config,
24
25
    controldir,
25
26
    errors,
27
28
    repository,
28
29
    tests,
29
30
    )
30
 
from breezy.bzr import (
31
 
    bzrdir,
32
 
    )
33
31
from breezy.bzr.groupcompress_repo import RepositoryFormat2a
34
32
 
35
33
 
104
102
            TestObsoleteRepoFormat)
105
103
        repository.format_registry.register(TestObsoleteRepoFormat)
106
104
        self.addCleanup(controldir.format_registry.remove, "testobsolete")
107
 
        bzrdir.register_metadir(controldir.format_registry, "testobsolete",
 
105
        bzr.register_metadir(controldir.format_registry, "testobsolete",
108
106
            "breezy.tests.blackbox.test_exceptions.TestObsoleteRepoFormat",
109
107
            branch_format='breezy.bzr.branch.BzrBranchFormat7',
110
108
            tree_format='breezy.bzr.workingtree_4.WorkingTreeFormat6',