/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 main branch.

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
 
        if control._format.flexible_components:
 
1017
        if not control._format.fixed_components:
1018
1018
            self.assertEqual(repo.bzrdir.root_transport.base,
1019
1019
                made_repo.bzrdir.root_transport.base)
1020
1020
 
1082
1082
        if control is None:
1083
1083
            # uninitialisable format
1084
1084
            return
1085
 
        if not self.bzrdir_format.flexible_components:
 
1085
        if self.bzrdir_format.fixed_components:
1086
1086
            # must stay with the all-in-one-format.
1087
1087
            repo_name = self.bzrdir_format.network_name()
1088
1088
        self.assertEqual(repo_name, repo._format.network_name())
1115
1115
            # set, so we skip a number of tests for RemoteBzrDirFormat's.
1116
1116
            self.assertIsInstance(control, RemoteBzrDir)
1117
1117
        else:
1118
 
            if need_meta and not expected_format.flexible_components:
 
1118
            if need_meta and expected_format.fixed_components:
1119
1119
                # Pre-metadir formats change when we are making something that
1120
1120
                # needs a metaformat, because clone is used for push.
1121
1121
                expected_format = bzrdir.BzrDirMetaFormat1()