/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 bzrlib/tests/blackbox/test_whoami.py

  • Committer: Aaron Bentley
  • Date: 2006-07-11 15:04:57 UTC
  • mto: This revision was merged to the branch mainline in revision 1858.
  • Revision ID: abentley@panoramicfeedback.com-20060711150457-d4c96e9c60843973
Ensure commit respects file spec when committing removals

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_whoami.py
1
 
# Copyright (C) 2006 Canonical Ltd
 
1
# Copyright (C) 2006 by Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
 
18
18
"""Black-box tests for bzr whoami."""
32
32
        self.assertTrue(len(out) > 0)
33
33
        self.assertEquals(1, out.count('@'))
34
34
 
35
 
        out = self.run_bzr("whoami --email")[0]
 
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('.')
42
42
        b = bzrlib.branch.Branch.open('.')
43
 
        b.get_config().set_user_option('email',
44
 
                                       'Branch Identity <branch@identi.ty>')
45
 
        bzr_email = os.environ.get('BZR_EMAIL')
 
43
        b.get_config().set_user_option('email', 'Branch Identity <branch@identi.ty>')
 
44
        bzr_email = os.environ.get('BZREMAIL')
46
45
        if bzr_email is not None:
47
 
            del os.environ['BZR_EMAIL']
 
46
            del os.environ['BZREMAIL']
48
47
        try:
49
48
            whoami = self.run_bzr("whoami")[0]
50
49
            self.assertEquals('Branch Identity <branch@identi.ty>\n', whoami)
51
 
            whoami_email = self.run_bzr("whoami --email")[0]
 
50
            whoami_email = self.run_bzr("whoami", "--email")[0]
52
51
            self.assertEquals('branch@identi.ty\n', whoami_email)
53
52
 
54
 
            # Verify that the environment variable overrides the value
 
53
            # Verify that the environment variable overrides the value 
55
54
            # in the file
56
 
            os.environ['BZR_EMAIL'] = 'Different ID <other@environ.ment>'
 
55
            os.environ['BZREMAIL'] = 'Different ID <other@environ.ment>'
57
56
            whoami = self.run_bzr("whoami")[0]
58
57
            self.assertEquals('Different ID <other@environ.ment>\n', whoami)
59
 
            whoami_email = self.run_bzr("whoami --email")[0]
 
58
            whoami_email = self.run_bzr("whoami", "--email")[0]
60
59
            self.assertEquals('other@environ.ment\n', whoami_email)
61
 
            del os.environ['BZR_EMAIL']
62
60
        finally:
63
61
            if bzr_email is not None:
64
 
                os.environ['BZR_EMAIL'] = bzr_email
 
62
                os.environ['BZREMAIL'] = bzr_email
65
63
 
66
64
    def test_whoami_utf8(self):
67
65
        """verify that an identity can be in utf-8."""
68
66
        wt = self.make_branch_and_tree('.')
69
 
        self.run_bzr(['whoami', u'Branch Identity \u20ac <branch@identi.ty>'],
70
 
                     encoding='utf-8')
71
 
        bzr_email = os.environ.get('BZR_EMAIL')
 
67
        self.run_bzr('whoami', u'Branch Identity \u20ac <branch@identi.ty>', encoding='utf-8')
 
68
        bzr_email = os.environ.get('BZREMAIL')
72
69
        if bzr_email is not None:
73
 
            del os.environ['BZR_EMAIL']
 
70
            del os.environ['BZREMAIL']
74
71
        try:
75
72
            whoami = self.run_bzr("whoami", encoding='utf-8')[0]
76
 
            self.assertEquals('Branch Identity \xe2\x82\xac ' +
77
 
                              '<branch@identi.ty>\n', whoami)
78
 
            whoami_email = self.run_bzr("whoami --email",
79
 
                                        encoding='utf-8')[0]
 
73
            self.assertEquals('Branch Identity \xe2\x82\xac <branch@identi.ty>\n', whoami)
 
74
            whoami_email = self.run_bzr("whoami", "--email", encoding='utf-8')[0]
80
75
            self.assertEquals('branch@identi.ty\n', whoami_email)
81
76
        finally:
82
77
            if bzr_email is not None:
83
 
                os.environ['BZR_EMAIL'] = bzr_email
 
78
                os.environ['BZREMAIL'] = bzr_email
84
79
 
85
80
    def test_whoami_ascii(self):
86
 
        """
87
 
        verify that whoami doesn't totally break when in utf-8, using an ascii
88
 
        encoding.
89
 
        """
 
81
        """verify that whoami doesn't totally break when in utf-8, using an ascii encoding."""
90
82
        wt = self.make_branch_and_tree('.')
91
83
        b = bzrlib.branch.Branch.open('.')
92
 
        b.get_config().set_user_option('email', u'Branch Identity \u20ac ' +
93
 
                                       '<branch@identi.ty>')
94
 
        bzr_email = os.environ.get('BZR_EMAIL')
 
84
        b.get_config().set_user_option('email', u'Branch Identity \u20ac <branch@identi.ty>')
 
85
        bzr_email = os.environ.get('BZREMAIL')
95
86
        if bzr_email is not None:
96
 
            del os.environ['BZR_EMAIL']
 
87
            del os.environ['BZREMAIL']
97
88
        try:
98
89
            whoami = self.run_bzr("whoami", encoding='ascii')[0]
99
90
            self.assertEquals('Branch Identity ? <branch@identi.ty>\n', whoami)
100
 
            whoami_email = self.run_bzr("whoami --email",
101
 
                                        encoding='ascii')[0]
 
91
            whoami_email = self.run_bzr("whoami", "--email", encoding='ascii')[0]
102
92
            self.assertEquals('branch@identi.ty\n', whoami_email)
103
93
        finally:
104
94
            if bzr_email is not None:
105
 
                os.environ['BZR_EMAIL'] = bzr_email
106
 
 
107
 
    def test_warning(self):
108
 
        """verify that a warning is displayed if no email is given."""
109
 
        self.make_branch_and_tree('.')
110
 
        display = self.run_bzr(['whoami', 'Branch Identity'])[1]
111
 
        self.assertEquals('"Branch Identity" does not seem to contain an '
112
 
                          'email address.  This is allowed, but not '
113
 
                          'recommended.\n', display)
 
95
                os.environ['BZREMAIL'] = bzr_email