← 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: Aaron Bentley
  • Date: 2008-03-03 16:52:41 UTC
  • mfrom: (3144.3.11 fix-conflict-handling)
  • mto: This revision was merged to the branch mainline in revision 3250.
  • Revision ID: aaron@aaronbentley.com-20080303165241-0k2c7ggs6kr9q6hf
Merge with fix-conflict-handling

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_info.py
126
126
 
127
127
    def test_describe_tree_format(self):
128
128
        for key in bzrdir.format_registry.keys():
129
 
            if key == 'default':
 
129
            if key in bzrdir.format_registry.aliases():
130
130
                continue
131
131
            self.assertTreeDescription(key)
132
132
 
133
133
    def test_describe_checkout_format(self):
134
134
        for key in bzrdir.format_registry.keys():
135
 
            if key in ('default', 'weave', 'experimental'):
136
 
                continue
137
 
            if key.startswith('experimental-'):
138
 
                # these are typically hidden or aliases for other formats
 
135
            if key in bzrdir.format_registry.aliases():
 
136
                # Aliases will not describe correctly in the UI because the
 
137
                # real format is found.
 
138
                continue
 
139
            # legacy: weave does not support checkouts
 
140
            if key == 'weave':
 
141
                continue
 
142
            if bzrdir.format_registry.get_info(key).experimental:
 
143
                # We don't require that experimental formats support checkouts
 
144
                # or describe correctly in the UI.
139
145
                continue
140
146
            expected = None
141
147
            if key in ('dirstate', 'dirstate-tags', 'dirstate-with-subtree',
149
155
 
150
156
    def test_describe_branch_format(self):
151
157
        for key in bzrdir.format_registry.keys():
152
 
            if key == 'default':
 
158
            if key in bzrdir.format_registry.aliases():
153
159
                continue
154
160
            expected = None
155
161
            if key in ('dirstate', 'knit'):
158
164
 
159
165
    def test_describe_repo_format(self):
160
166
        for key in bzrdir.format_registry.keys():
161
 
            if key == 'default':
 
167
            if key in bzrdir.format_registry.aliases():
162
168
                continue
163
169
            expected = None
164
170
            if key in ('dirstate', 'knit', 'dirstate-tags'):