← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_config.py

  • Committer: Vincent Ladeuil
  • Date: 2011-08-24 19:38:19 UTC
  • mto: (6123.1.7 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6123.
  • Revision ID: v.ladeuil+lp@free.fr-20110824193819-h090pa0rodntz2gd
If conversion fails, the default value still needs to be expanded (if applicable).

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_config.py
3229
3229
 
3230
3230
    def setUp(self):
3231
3231
        super(TestStackExpandOptions, self).setUp()
 
3232
        self.overrideAttr(config, 'option_registry', config.OptionRegistry())
 
3233
        self.registry = config.option_registry
3232
3234
        self.conf = build_branch_stack(self)
3233
3235
 
3234
3236
    def assertExpansion(self, expected, string, env=None):
3237
3239
    def test_no_expansion(self):
3238
3240
        self.assertExpansion('foo', 'foo')
3239
3241
 
 
3242
    def test_expand_default_value(self):
 
3243
        self.conf.store._load_from_string('bar=baz')
 
3244
        self.registry.register(config.Option('foo', default=u'{bar}'))
 
3245
        self.assertEquals('baz', self.conf.get('foo', expand=True))
 
3246
 
 
3247
    def test_expand_default_from_env(self):
 
3248
        self.conf.store._load_from_string('bar=baz')
 
3249
        self.registry.register(config.Option('foo', default_from_env=['FOO']))
 
3250
        self.overrideEnv('FOO', '{bar}')
 
3251
        self.assertEquals('baz', self.conf.get('foo', expand=True))
 
3252
 
 
3253
    def test_expand_default_on_failed_conversion(self):
 
3254
        self.conf.store._load_from_string('baz=bogus\nbar=42\nfoo={baz}')
 
3255
        self.registry.register(
 
3256
            config.Option('foo', default=u'{bar}',
 
3257
                          from_unicode=config.int_from_store))
 
3258
        self.assertEquals(42, self.conf.get('foo', expand=True))
 
3259
 
3240
3260
    def test_env_adding_options(self):
3241
3261
        self.assertExpansion('bar', '{foo}', {'foo': 'bar'})
3242
3262