← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_info.py

(gz) Fix test failure on alpha by correcting format string for
 gc_chk_sha1_record (Martin [gz])

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_info.py
148
148
            if key in ('pack-0.92',):
149
149
                expected = 'pack-0.92'
150
150
            elif key in ('knit', 'metaweave'):
151
 
                if 'metaweave' in bzrdir.format_registry:
152
 
                    expected = 'knit or metaweave'
153
 
                else:
154
 
                    expected = 'knit'
 
151
                expected = 'knit or metaweave'
155
152
            elif key in ('1.14', '1.14-rich-root'):
156
153
                expected = '1.14 or 1.14-rich-root'
157
154
            self.assertCheckoutDescription(key, expected)
186
183
                expected = '1.14-rich-root'
187
184
            self.assertRepoDescription(key, expected)
188
185
 
189
 
        format = bzrdir.format_registry.make_bzrdir('knit')
 
186
        format = bzrdir.format_registry.make_bzrdir('metaweave')
190
187
        format.set_branch_format(_mod_branch.BzrBranchFormat6())
191
188
        tree = self.make_branch_and_tree('unknown', format=format)
192
189
        self.assertEqual('unnamed', info.describe_format(tree.bzrdir,