← 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: Patch Queue Manager
  • Date: 2012-05-16 09:23:51 UTC
  • mfrom: (6523.1.1 test-fixes)
  • Revision ID: pqm@pqm.ubuntu.com-20120516092351-juhkm3zdl63nod8b
(vila) Fix some test isolation issues when random env vars are used.
 (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_config.py
2477
2477
 
2478
2478
    def test_help_is_set(self):
2479
2479
        option_help = self.registry.get_help(self.option_name)
2480
 
        self.assertNotEquals(None, option_help)
2481
2480
        # Come on, think about the user, he really wants to know what the
2482
2481
        # option is about
2483
2482
        self.assertIsNot(None, option_help)
3584
3583
        return config.MemoryStack(content)
3585
3584
 
3586
3585
    def test_override_value_from_env(self):
 
3586
        self.overrideEnv('FOO', None)
3587
3587
        self.registry.register(
3588
3588
            config.Option('foo', default='bar', override_from_env=['FOO']))
3589
3589
        self.overrideEnv('FOO', 'quux')
3592
3592
        self.assertEquals('quux', conf.get('foo'))
3593
3593
 
3594
3594
    def test_first_override_value_from_env_wins(self):
 
3595
        self.overrideEnv('NO_VALUE', None)
 
3596
        self.overrideEnv('FOO', None)
 
3597
        self.overrideEnv('BAZ', None)
3595
3598
        self.registry.register(
3596
3599
            config.Option('foo', default='bar',
3597
3600
                          override_from_env=['NO_VALUE', 'FOO', 'BAZ']))