← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_info.py

  • Committer: Vincent Ladeuil
  • Date: 2011-07-06 09:22:00 UTC
  • mfrom: (6008 +trunk)
  • mto: (6012.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 6013.
  • Revision ID: v.ladeuil+lp@free.fr-20110706092200-7iai2mwzc0sqdsvf
Merging in trunk

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
 
                expected = 'knit or metaweave'
 
151
                if 'metaweave' in bzrdir.format_registry:
 
152
                    expected = 'knit or metaweave'
 
153
                else:
 
154
                    expected = 'knit'
152
155
            elif key in ('1.14', '1.14-rich-root'):
153
156
                expected = '1.14 or 1.14-rich-root'
154
157
            self.assertCheckoutDescription(key, expected)
183
186
                expected = '1.14-rich-root'
184
187
            self.assertRepoDescription(key, expected)
185
188
 
186
 
        format = bzrdir.format_registry.make_bzrdir('metaweave')
 
189
        format = bzrdir.format_registry.make_bzrdir('knit')
187
190
        format.set_branch_format(_mod_branch.BzrBranchFormat6())
188
191
        tree = self.make_branch_and_tree('unknown', format=format)
189
192
        self.assertEqual('unnamed', info.describe_format(tree.bzrdir,