/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 breezy/tests/test_config.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-05-06 03:06:18 UTC
  • mfrom: (7500.1.2 trunk-merge-3.1)
  • Revision ID: breezy.the.bot@gmail.com-20200506030618-131sjbc876q7on66
Merge the 3.1 branch.

Merged from https://code.launchpad.net/~jelmer/brz/trunk-merge-3.1/+merge/383481

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_config.py
1481
1481
        self.assertEqual("Robert Collins <robertc@example.org>",
1482
1482
                         my_config.username())
1483
1483
 
 
1484
    def test_BRZ_EMAIL_OVERRIDES(self):
 
1485
        self.overrideEnv('BZR_EMAIL', "Robert Collins <robertc@example.org>")
 
1486
        branch = FakeBranch()
 
1487
        my_config = config.BranchConfig(branch)
 
1488
        self.assertEqual("Robert Collins <robertc@example.org>",
 
1489
                         my_config.username())
 
1490
 
1484
1491
    def test_get_user_option_global(self):
1485
1492
        my_config = self.get_branch_config(global_config=sample_config_text)
1486
1493
        self.assertEqual('something',
4645
4652
 
4646
4653
    def test_default_email_uses_BRZ_EMAIL(self):
4647
4654
        conf = config.MemoryStack(b'email=jelmer@debian.org')
4648
 
        # BRZ_EMAIL takes precedence over EMAIL
 
4655
        # BRZ_EMAIL takes precedence over BZR_EMAIL and EMAIL
4649
4656
        self.overrideEnv('BRZ_EMAIL', 'jelmer@samba.org')
 
4657
        self.overrideEnv('BZR_EMAIL', 'jelmer@jelmer.uk')
 
4658
        self.overrideEnv('EMAIL', 'jelmer@apache.org')
 
4659
        self.assertEqual('jelmer@samba.org', conf.get('email'))
 
4660
 
 
4661
    def test_default_email_uses_BZR_EMAIL(self):
 
4662
        conf = config.MemoryStack(b'email=jelmer@debian.org')
 
4663
        # BZR_EMAIL takes precedence over EMAIL
 
4664
        self.overrideEnv('BZR_EMAIL', 'jelmer@samba.org')
4650
4665
        self.overrideEnv('EMAIL', 'jelmer@apache.org')
4651
4666
        self.assertEqual('jelmer@samba.org', conf.get('email'))
4652
4667