/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_options.py

  • Committer: John Arbash Meinel
  • Date: 2007-02-13 20:33:57 UTC
  • mfrom: (2283 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2294.
  • Revision ID: john@arbash-meinel.com-20070213203357-b7yg41mi9sk6cqd0
[merge] bzr.dev 2283
resolve conflicts in moved repository formats
small issue with osutils.contains_whitespace()

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_options.py
25
25
from bzrlib.builtins import cmd_commit, cmd_log, cmd_status
26
26
from bzrlib.commands import Command, parse_args
27
27
from bzrlib.tests import TestCase
 
28
from bzrlib.repofmt import knitrepo
28
29
 
29
30
def parse(options, args):
30
31
    parser = option.get_optparser(dict((o.name, o) for o in options))
159
160
 
160
161
    def test_registry_converter(self):
161
162
        options = [option.RegistryOption('format', '',
162
 
                   bzrdir.format_registry, builtins.get_format_type)]
 
163
                   bzrdir.format_registry, bzrdir.format_registry.make_bzrdir)]
163
164
        opts, args = self.parse(options, ['--format', 'knit'])
164
165
        self.assertIsInstance(opts.format.repository_format,
165
 
                              repository.RepositoryFormatKnit1)
 
166
                              knitrepo.RepositoryFormatKnit1)
166
167
 
167
168
    def test_help(self):
168
169
        registry = bzrdir.BzrDirFormatRegistry()
169
170
        registry.register_metadir('one', 'RepositoryFormat7', 'one help')
170
 
        registry.register_metadir('two', 'RepositoryFormatKnit1', 'two help')
 
171
        registry.register_metadir('two', 'RepositoryFormatKnit1', 'two help',
 
172
            repo_module='bzrlib.repofmt.knitrepo')
171
173
        registry.set_default('one')
172
174
        options = [option.RegistryOption('format', 'format help', registry,
173
 
                   str, value_switches=True)]
 
175
                   str, value_switches=True, title='Formats')]
174
176
        parser = option.get_optparser(dict((o.name, o) for o in options))
175
177
        value = parser.format_option_help()
176
178
        self.assertContainsRe(value, 'format.*format help')
177
179
        self.assertContainsRe(value, 'one.*one help')
 
180
        self.assertContainsRe(value, 'Formats:\n *--format')
178
181
 
179
182
    def test_iter_switches(self):
180
183
        opt = option.Option('hello', help='fg')
188
191
                         [('hello', None, 'GAR', 'fg')])
189
192
        registry = bzrdir.BzrDirFormatRegistry()
190
193
        registry.register_metadir('one', 'RepositoryFormat7', 'one help')
191
 
        registry.register_metadir('two', 'RepositoryFormatKnit1', 'two help')
 
194
        registry.register_metadir('two', 'RepositoryFormatKnit1', 'two help',
 
195
            repo_module='bzrlib.repofmt.knitrepo')
192
196
        registry.set_default('one')
193
197
        opt = option.RegistryOption('format', 'format help', registry,
194
198
                                    value_switches=False)