/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: John Arbash Meinel
  • Date: 2007-03-20 00:49:11 UTC
  • mto: This revision was merged to the branch mainline in revision 2366.
  • Revision ID: john@arbash-meinel.com-20070320004911-0qajqnddr3rf9r2e
Simplify the test even further....
Basically, if you have a file deleted as removed, and then you unversion its directory
it deletes all records in the dirblock, not realizing that some of them might
already be marked as removed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
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('.')
45
45
        bzr_email = os.environ.get('BZR_EMAIL')
46
46
        if bzr_email is not None:
47
47
            del os.environ['BZR_EMAIL']
 
48
        bzremail = os.environ.get('BZREMAIL')
 
49
        if bzremail is not None:
 
50
            del os.environ['BZREMAIL']
48
51
        try:
49
52
            whoami = self.run_bzr("whoami")[0]
50
53
            self.assertEquals('Branch Identity <branch@identi.ty>\n', whoami)
51
 
            whoami_email = self.run_bzr("whoami --email")[0]
 
54
            whoami_email = self.run_bzr("whoami", "--email")[0]
52
55
            self.assertEquals('branch@identi.ty\n', whoami_email)
53
56
 
54
 
            # Verify that the environment variable overrides the value
 
57
            # Verify that the environment variable overrides the value 
55
58
            # in the file
56
59
            os.environ['BZR_EMAIL'] = 'Different ID <other@environ.ment>'
57
60
            whoami = self.run_bzr("whoami")[0]
58
61
            self.assertEquals('Different ID <other@environ.ment>\n', whoami)
59
 
            whoami_email = self.run_bzr("whoami --email")[0]
 
62
            whoami_email = self.run_bzr("whoami", "--email")[0]
60
63
            self.assertEquals('other@environ.ment\n', whoami_email)
61
64
            del os.environ['BZR_EMAIL']
 
65
            os.environ['BZREMAIL'] = 'Yet Another ID <yetother@environ.ment>'
 
66
            whoami, warn = self.run_bzr("whoami")
 
67
            self.assertEquals('Yet Another ID <yetother@environ.ment>\n', whoami)
 
68
            self.assertTrue(len(warn) > 0)
 
69
            del os.environ['BZREMAIL']
62
70
        finally:
63
71
            if bzr_email is not None:
64
72
                os.environ['BZR_EMAIL'] = bzr_email
 
73
            if bzremail is not None:
 
74
                os.environ['BZREMAIL'] = bzremail
65
75
 
66
76
    def test_whoami_utf8(self):
67
77
        """verify that an identity can be in utf-8."""
68
78
        wt = self.make_branch_and_tree('.')
69
 
        self.run_bzr(['whoami', u'Branch Identity \u20ac <branch@identi.ty>'],
 
79
        self.run_bzr('whoami', u'Branch Identity \u20ac <branch@identi.ty>',
70
80
                     encoding='utf-8')
71
81
        bzr_email = os.environ.get('BZR_EMAIL')
72
82
        if bzr_email is not None:
75
85
            whoami = self.run_bzr("whoami", encoding='utf-8')[0]
76
86
            self.assertEquals('Branch Identity \xe2\x82\xac ' +
77
87
                              '<branch@identi.ty>\n', whoami)
78
 
            whoami_email = self.run_bzr("whoami --email",
 
88
            whoami_email = self.run_bzr("whoami", "--email",
79
89
                                        encoding='utf-8')[0]
80
90
            self.assertEquals('branch@identi.ty\n', whoami_email)
81
91
        finally:
97
107
        try:
98
108
            whoami = self.run_bzr("whoami", encoding='ascii')[0]
99
109
            self.assertEquals('Branch Identity ? <branch@identi.ty>\n', whoami)
100
 
            whoami_email = self.run_bzr("whoami --email",
 
110
            whoami_email = self.run_bzr("whoami", "--email",
101
111
                                        encoding='ascii')[0]
102
112
            self.assertEquals('branch@identi.ty\n', whoami_email)
103
113
        finally:
107
117
    def test_warning(self):
108
118
        """verify that a warning is displayed if no email is given."""
109
119
        self.make_branch_and_tree('.')
110
 
        display = self.run_bzr(['whoami', 'Branch Identity'])[1]
 
120
        display = self.run_bzr('whoami', 'Branch Identity')[1]
111
121
        self.assertEquals('"Branch Identity" does not seem to contain an '
112
122
                          'email address.  This is allowed, but not '
113
123
                          'recommended.\n', display)