← 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: Mark Hammond
  • Date: 2008-12-28 05:21:23 UTC
  • mfrom: (3920 +trunk)
  • mto: (3932.1.1 prepare-1.11)
  • mto: This revision was merged to the branch mainline in revision 3937.
  • Revision ID: mhammond@skippinet.com.au-20081228052123-f78xs5sbdkotshwf
merge trunk

Show diffs side-by-side

added added

removed removed

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