~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_config.py

Merge from bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
750
750
        my_config.branch.control_files.email = "John"
751
751
        self.assertEqual("John", my_config._get_user_id())
752
752
 
753
 
    def test_BZREMAIL_OVERRIDES(self):
754
 
        os.environ['BZREMAIL'] = "Robert Collins <robertc@example.org>"
 
753
    def test_BZR_EMAIL_OVERRIDES(self):
 
754
        os.environ['BZR_EMAIL'] = "Robert Collins <robertc@example.org>"
755
755
        branch = FakeBranch()
756
756
        my_config = config.BranchConfig(branch)
757
757
        self.assertEqual("Robert Collins <robertc@example.org>",