← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_whoami.py

  • Committer: John Arbash Meinel
  • Date: 2009-02-23 15:29:35 UTC
  • mfrom: (3943.7.7 bzr.code_style_cleanup)
  • mto: This revision was merged to the branch mainline in revision 4033.
  • Revision ID: john@arbash-meinel.com-20090223152935-oel9m92mwcc6nb4h
Merge the removal of all trailing whitespace, and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_whoami.py
35
35
        out = self.run_bzr("whoami --email")[0]
36
36
        self.assertTrue(len(out) > 0)
37
37
        self.assertEquals(1, out.count('@'))
38
 
        
 
38
 
39
39
    def test_whoami_branch(self):
40
40
        """branch specific user identity works."""
41
41
        wt = self.make_branch_and_tree('.')
51
51
            whoami_email = self.run_bzr("whoami --email")[0]
52
52
            self.assertEquals('branch@identi.ty\n', whoami_email)
53
53
 
54
 
            # Verify that the environment variable overrides the value 
 
54
            # Verify that the environment variable overrides the value
55
55
            # in the file
56
56
            os.environ['BZR_EMAIL'] = 'Different ID <other@environ.ment>'
57
57
            whoami = self.run_bzr("whoami")[0]