← 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: 2007-05-18 18:32:14 UTC
  • mto: This revision was merged to the branch mainline in revision 2528.
  • Revision ID: aaron.bentley@utoronto.ca-20070518183214-b7qfkw9z0ou5egmi
Change separator from '/' to 'or'

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_info.py
126
126
                continue
127
127
            expected = None
128
128
            if key in ('dirstate', 'dirstate-tags', 'dirstate-with-subtree'):
129
 
                expected = 'dirstate / dirstate-tags'
 
129
                expected = 'dirstate or dirstate-tags'
130
130
            if key in ('knit', 'metaweave'):
131
 
                expected = 'knit / metaweave'
 
131
                expected = 'knit or metaweave'
132
132
            self.assertCheckoutDescription(key, expected)
133
133
 
134
134
        for key in bzrdir.format_registry.keys():
136
136
                continue
137
137
            expected = None
138
138
            if key in ('dirstate', 'knit'):
139
 
                expected = 'dirstate / knit'
 
139
                expected = 'dirstate or knit'
140
140
            self.assertBranchDescription(key, expected)
141
141
 
142
142
        for key in bzrdir.format_registry.keys():
144
144
                continue
145
145
            expected = None
146
146
            if key in ('dirstate', 'knit', 'dirstate-tags'):
147
 
                expected = 'dirstate / dirstate-tags / knit'
 
147
                expected = 'dirstate or dirstate-tags or knit'
148
148
            self.assertRepoDescription(key, expected)
149
149
 
150
150
        format = bzrdir.format_registry.make_bzrdir('metaweave')