← 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: 2010-10-07 06:08:01 UTC
  • mto: This revision was merged to the branch mainline in revision 5491.
  • Revision ID: v.ladeuil+lp@free.fr-20101007060801-wfdhizfhfmctl8qa
Fix some typos and propose a release planning.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_info.py
1
 
# Copyright (C) 2007-2011 Canonical Ltd
 
1
# Copyright (C) 2007-2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
import sys
 
18
from urllib import quote
18
19
 
19
20
from bzrlib import (
20
21
    branch as _mod_branch,
148
149
            if key in ('pack-0.92',):
149
150
                expected = 'pack-0.92'
150
151
            elif key in ('knit', 'metaweave'):
151
 
                if 'metaweave' in bzrdir.format_registry:
152
 
                    expected = 'knit or metaweave'
153
 
                else:
154
 
                    expected = 'knit'
 
152
                expected = 'knit or metaweave'
155
153
            elif key in ('1.14', '1.14-rich-root'):
156
154
                expected = '1.14 or 1.14-rich-root'
157
155
            self.assertCheckoutDescription(key, expected)
186
184
                expected = '1.14-rich-root'
187
185
            self.assertRepoDescription(key, expected)
188
186
 
189
 
        format = bzrdir.format_registry.make_bzrdir('knit')
 
187
        format = bzrdir.format_registry.make_bzrdir('metaweave')
190
188
        format.set_branch_format(_mod_branch.BzrBranchFormat6())
191
189
        tree = self.make_branch_and_tree('unknown', format=format)
192
190
        self.assertEqual('unnamed', info.describe_format(tree.bzrdir,