← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_options.py

  • Committer: Patch Queue Manager
  • Date: 2012-03-06 19:49:19 UTC
  • mfrom: (6472.2.6 use-bzr-controldir)
  • Revision ID: pqm@pqm.ubuntu.com-20120306194919-kt7mj6xmhifsgees
(jelmer) Use bzrlib.controldir for generic access to control directories,
 rather than bzrlib.bzrdir. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_options.py
160
160
 
161
161
    def test_registry_converter(self):
162
162
        options = [option.RegistryOption('format', '',
163
 
                   bzrdir.format_registry, bzrdir.format_registry.make_bzrdir)]
 
163
                   controldir.format_registry, controldir.format_registry.make_bzrdir)]
164
164
        opts, args = self.parse(options, ['--format', 'knit'])
165
165
        self.assertIsInstance(opts.format.repository_format,
166
166
                              knitrepo.RepositoryFormatKnit1)
167
167
 
168
168
    def test_lazy_registry(self):
169
169
        options = [option.RegistryOption('format', '',
170
 
                   lazy_registry=('bzrlib.bzrdir','format_registry'),
 
170
                   lazy_registry=('bzrlib.controldir','format_registry'),
171
171
                   converter=str)]
172
172
        opts, args = self.parse(options, ['--format', 'knit'])
173
173
        self.assertEqual({'format': 'knit'}, opts)