/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 bzrlib/tests/per_controldir/test_controldir.py

Merge more uses of flexible_components.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_controldir/test_controldir.py
1014
1014
        if control is None:
1015
1015
            # uninitialisable format
1016
1016
            return
1017
 
        from bzrlib.plugins.weave_fmt.bzrdir import BzrDirFormat5, BzrDirFormat6
1018
 
        if not isinstance(control._format, (BzrDirFormat5, BzrDirFormat6,)):
 
1017
        if control._format.flexible_components:
1019
1018
            self.assertEqual(repo.bzrdir.root_transport.base,
1020
1019
                made_repo.bzrdir.root_transport.base)
1021
1020
 
1083
1082
        if control is None:
1084
1083
            # uninitialisable format
1085
1084
            return
1086
 
        from bzrlib.plugins.weave_fmt.bzrdir import BzrDirFormat5, BzrDirFormat6
1087
 
        if isinstance(self.bzrdir_format, (BzrDirFormat5, BzrDirFormat6)):
 
1085
        if not self.bzrdir_format.flexible_components:
1088
1086
            # must stay with the all-in-one-format.
1089
1087
            repo_name = self.bzrdir_format.network_name()
1090
1088
        self.assertEqual(repo_name, repo._format.network_name())