~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_info.py

Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
139
139
                continue
140
140
            expected = None
141
141
            if key in ('dirstate', 'dirstate-tags', 'dirstate-with-subtree',
142
 
                'knitpack-experimental', 'knitpack-subtree-experimental',
143
 
                'rich-root'):
144
 
                expected = 'dirstate or dirstate-tags or'\
145
 
                    ' knitpack-experimental or rich-root'
 
142
                'pack-0.92', 'pack-0.92-subtree', 'rich-root',
 
143
                'rich-root-pack'):
 
144
                expected = 'dirstate or dirstate-tags or pack-0.92 or'\
 
145
                    ' rich-root or rich-root-pack'
146
146
            if key in ('knit', 'metaweave'):
147
147
                expected = 'knit or metaweave'
148
148
            self.assertCheckoutDescription(key, expected)