← 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: Ian Clatworthy
  • Date: 2008-07-31 12:08:45 UTC
  • mto: (3586.1.15 views-ui)
  • mto: This revision was merged to the branch mainline in revision 4030.
  • Revision ID: ian.clatworthy@canonical.com-20080731120845-n6fdr61i16o16a0u
add 1.7 and 1.7-rich-root formats

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_info.py
150
150
                expected = '1.6 or 1.6-rich-root or ' \
151
151
                    'dirstate or dirstate-tags or pack-0.92 or'\
152
152
                    ' rich-root or rich-root-pack'
153
 
            if key in ('knit', 'metaweave'):
 
153
            elif key in ('knit', 'metaweave'):
154
154
                expected = 'knit or metaweave'
 
155
            elif key in ('1.7', '1.7-rich-root'):
 
156
                expected = '1.7 or 1.7-rich-root'
155
157
            self.assertCheckoutDescription(key, expected)
156
158
 
157
159
    def test_describe_branch_format(self):
161
163
            expected = None
162
164
            if key in ('dirstate', 'knit'):
163
165
                expected = 'dirstate or knit'
 
166
            elif key in ('1.6', '1.7'):
 
167
                expected = '1.6 or 1.7'
 
168
            elif key in ('1.6-rich-root', '1.7-rich-root'):
 
169
                expected = '1.6-rich-root or 1.7-rich-root'
164
170
            self.assertBranchDescription(key, expected)
165
171
 
166
172
    def test_describe_repo_format(self):
170
176
            expected = None
171
177
            if key in ('dirstate', 'knit', 'dirstate-tags'):
172
178
                expected = 'dirstate or dirstate-tags or knit'
 
179
            elif key in ('1.6', '1.7'):
 
180
                expected = '1.6 or 1.7'
 
181
            elif key in ('1.6-rich-root', '1.7-rich-root'):
 
182
                expected = '1.6-rich-root or 1.7-rich-root'
173
183
            self.assertRepoDescription(key, expected)
174
184
 
175
185
        format = bzrdir.format_registry.make_bzrdir('metaweave')