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

  • Committer: Jelmer Vernooij
  • Date: 2017-05-21 14:47:52 UTC
  • mto: This revision was merged to the branch mainline in revision 6623.
  • Revision ID: jelmer@jelmer.uk-20170521144752-8o6jt0a6xat9g7lm
More renames; commands in output, environment variables.

Show diffs side-by-side

added added

removed removed

Lines of Context:
brzlib/tests/test_config.py
561
561
        self.overrideEnv('XDG_CACHE_HOME', '')
562
562
        if sys.platform == 'win32':
563
563
            self.overrideEnv(
564
 
                'BZR_HOME', r'C:\Documents and Settings\bogus\Application Data')
 
564
                'BRZ_HOME', r'C:\Documents and Settings\bogus\Application Data')
565
565
            self.bzr_home = \
566
566
                'C:/Documents and Settings/bogus/Application Data/bazaar/2.0'
567
567
        else:
600
600
                'XDG config dir not used on this platform')
601
601
        super(TestXDGConfigDir, self).setUp()
602
602
        self.overrideEnv('HOME', self.test_home_dir)
603
 
        # BZR_HOME overrides everything we want to test so unset it.
604
 
        self.overrideEnv('BZR_HOME', None)
 
603
        # BRZ_HOME overrides everything we want to test so unset it.
 
604
        self.overrideEnv('BRZ_HOME', None)
605
605
 
606
606
    def test_xdg_config_dir_exists(self):
607
607
        """When ~/.config/bazaar exists, use it as the config dir."""
1721
1721
        self.assertEqual('bzr', my_config.get_bzr_remote_path())
1722
1722
        my_config.set_user_option('bzr_remote_path', '/path-bzr')
1723
1723
        self.assertEqual('/path-bzr', my_config.get_bzr_remote_path())
1724
 
        self.overrideEnv('BZR_REMOTE_PATH', '/environ-bzr')
 
1724
        self.overrideEnv('BRZ_REMOTE_PATH', '/environ-bzr')
1725
1725
        self.assertEqual('/environ-bzr', my_config.get_bzr_remote_path())
1726
1726
 
1727
1727
 
1761
1761
        self.assertEqual("Robert Collins <robertc@example.org>",
1762
1762
                        my_config.username())
1763
1763
 
1764
 
    def test_BZR_EMAIL_OVERRIDES(self):
1765
 
        self.overrideEnv('BZR_EMAIL', "Robert Collins <robertc@example.org>")
 
1764
    def test_BRZ_EMAIL_OVERRIDES(self):
 
1765
        self.overrideEnv('BRZ_EMAIL', "Robert Collins <robertc@example.org>")
1766
1766
        branch = FakeBranch()
1767
1767
        my_config = config.BranchConfig(branch)
1768
1768
        self.assertEqual("Robert Collins <robertc@example.org>",
4999
4999
 
5000
5000
class EmailOptionTests(tests.TestCase):
5001
5001
 
5002
 
    def test_default_email_uses_BZR_EMAIL(self):
 
5002
    def test_default_email_uses_BRZ_EMAIL(self):
5003
5003
        conf = config.MemoryStack('email=jelmer@debian.org')
5004
 
        # BZR_EMAIL takes precedence over EMAIL
5005
 
        self.overrideEnv('BZR_EMAIL', 'jelmer@samba.org')
 
5004
        # BRZ_EMAIL takes precedence over EMAIL
 
5005
        self.overrideEnv('BRZ_EMAIL', 'jelmer@samba.org')
5006
5006
        self.overrideEnv('EMAIL', 'jelmer@apache.org')
5007
5007
        self.assertEqual('jelmer@samba.org', conf.get('email'))
5008
5008
 
5009
5009
    def test_default_email_uses_EMAIL(self):
5010
5010
        conf = config.MemoryStack('')
5011
 
        self.overrideEnv('BZR_EMAIL', None)
 
5011
        self.overrideEnv('BRZ_EMAIL', None)
5012
5012
        self.overrideEnv('EMAIL', 'jelmer@apache.org')
5013
5013
        self.assertEqual('jelmer@apache.org', conf.get('email'))
5014
5014
 
5015
 
    def test_BZR_EMAIL_overrides(self):
 
5015
    def test_BRZ_EMAIL_overrides(self):
5016
5016
        conf = config.MemoryStack('email=jelmer@debian.org')
5017
 
        self.overrideEnv('BZR_EMAIL', 'jelmer@apache.org')
 
5017
        self.overrideEnv('BRZ_EMAIL', 'jelmer@apache.org')
5018
5018
        self.assertEqual('jelmer@apache.org', conf.get('email'))
5019
 
        self.overrideEnv('BZR_EMAIL', None)
 
5019
        self.overrideEnv('BRZ_EMAIL', None)
5020
5020
        self.overrideEnv('EMAIL', 'jelmer@samba.org')
5021
5021
        self.assertEqual('jelmer@debian.org', conf.get('email'))
5022
5022