/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 breezy/tests/blackbox/test_annotate.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-07-14 19:47:11 UTC
  • mfrom: (7027.4.12 python3-blackbox)
  • Revision ID: breezy.the.bot@gmail.com-20180714194711-h73vd0gzphiab6vf
Change run_bzr to use StringIOWithEncoding for stderr and stdout on python 3.

Merged from https://code.launchpad.net/~jelmer/brz/python3-blackbox/+merge/349090

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_annotate.py
69
69
 
70
70
    def test_annotate_cmd(self):
71
71
        out, err = self.run_bzr('annotate hello.txt')
72
 
        self.assertEqual(b'', err)
73
 
        self.assertEqualDiff(b'''\
 
72
        self.assertEqual('', err)
 
73
        self.assertEqualDiff('''\
74
74
1   test@us | my helicopter
75
75
3   user@te | your helicopter
76
76
4   user@te | all of
79
79
 
80
80
    def test_annotate_cmd_full(self):
81
81
        out, err = self.run_bzr('annotate hello.txt --all')
82
 
        self.assertEqual(b'', err)
83
 
        self.assertEqualDiff(b'''\
 
82
        self.assertEqual('', err)
 
83
        self.assertEqualDiff('''\
84
84
1   test@us | my helicopter
85
85
3   user@te | your helicopter
86
86
4   user@te | all of
89
89
 
90
90
    def test_annotate_cmd_long(self):
91
91
        out, err = self.run_bzr('annotate hello.txt --long')
92
 
        self.assertEqual(b'', err)
93
 
        self.assertEqualDiff(b'''\
 
92
        self.assertEqual('', err)
 
93
        self.assertEqualDiff('''\
94
94
1   test@user 20061212 | my helicopter
95
95
3   user@test 20061213 | your helicopter
96
96
4   user@test 20061213 | all of
102
102
        max_len = max([len(self.revision_id_1),
103
103
                       len(self.revision_id_3),
104
104
                       len(self.revision_id_4)])
105
 
        self.assertEqual(b'', err)
106
 
        self.assertEqualDiff(b'''\
 
105
        self.assertEqual('', err)
 
106
        self.assertEqualDiff('''\
107
107
%*s | my helicopter
108
108
%*s | your helicopter
109
109
%*s | all of
110
110
%*s | our helicopters
111
 
''' % (max_len, self.revision_id_1,
112
 
       max_len, self.revision_id_3,
113
 
       max_len, self.revision_id_4,
114
 
       max_len, b'',
 
111
''' % (max_len, self.revision_id_1.decode('utf-8'),
 
112
       max_len, self.revision_id_3.decode('utf-8'),
 
113
       max_len, self.revision_id_4.decode('utf-8'),
 
114
       max_len, '',
115
115
      )
116
116
, out)
117
117
 
118
118
    def test_no_mail(self):
119
119
        out, err = self.run_bzr('annotate nomail.txt')
120
 
        self.assertEqual(b'', err)
121
 
        self.assertEqualDiff(b'''\
 
120
        self.assertEqual('', err)
 
121
        self.assertEqualDiff('''\
122
122
2   no mail | nomail
123
123
''', out)
124
124
 
125
125
    def test_annotate_cmd_revision(self):
126
126
        out, err = self.run_bzr('annotate hello.txt -r1')
127
 
        self.assertEqual(b'', err)
128
 
        self.assertEqualDiff(b'''\
 
127
        self.assertEqual('', err)
 
128
        self.assertEqualDiff('''\
129
129
1   test@us | my helicopter
130
130
''', out)
131
131
 
132
132
    def test_annotate_cmd_revision3(self):
133
133
        out, err = self.run_bzr('annotate hello.txt -r3')
134
 
        self.assertEqual(b'', err)
135
 
        self.assertEqualDiff(b'''\
 
134
        self.assertEqual('', err)
 
135
        self.assertEqualDiff('''\
136
136
1   test@us | my helicopter
137
137
3   user@te | your helicopter
138
138
''', out)
140
140
    def test_annotate_cmd_unknown_revision(self):
141
141
        out, err = self.run_bzr('annotate hello.txt -r 10',
142
142
                                retcode=3)
143
 
        self.assertEqual(b'', out)
144
 
        self.assertContainsRe(err, b"Requested revision: '10' does not exist")
 
143
        self.assertEqual('', out)
 
144
        self.assertContainsRe(err, "Requested revision: '10' does not exist")
145
145
 
146
146
    def test_annotate_cmd_two_revisions(self):
147
147
        out, err = self.run_bzr('annotate hello.txt -r1..2',
148
148
                                retcode=3)
149
 
        self.assertEqual(b'', out)
150
 
        self.assertEqual(b'brz: ERROR: brz annotate --revision takes'
151
 
                         b' exactly one revision identifier\n',
 
149
        self.assertEqual('', out)
 
150
        self.assertEqual('brz: ERROR: brz annotate --revision takes'
 
151
                         ' exactly one revision identifier\n',
152
152
                         err)
153
153
 
154
154
 
170
170
        tree.branch.create_checkout(self.get_url('work'), lightweight=True)
171
171
        out, err = self.run_bzr(['annotate', 'file', '-r', 'branch:../trunk'],
172
172
                                working_dir='work')
173
 
        self.assertEqual(b'', err)
 
173
        self.assertEqual('', err)
174
174
        self.assertEqual(
175
 
            b'1   test@ho | foo\n'
176
 
            b'            | gam\n',
 
175
            '1   test@ho | foo\n'
 
176
            '            | gam\n',
177
177
            out)
178
178
 
179
179
    def test_annotate_edited_file(self):
260
260
        tree.add('empty')
261
261
        tree.commit('add empty file')
262
262
        out, err = self.run_bzr(['annotate', 'empty'])
263
 
        self.assertEqual(b'', out)
 
263
        self.assertEqual('', out)
264
264
 
265
265
    def test_annotate_removed_file(self):
266
266
        tree = self.make_branch_and_tree('.')
271
271
        tree.remove('empty')
272
272
        tree.commit('remove empty file')
273
273
        out, err = self.run_bzr(['annotate', '-r1', 'empty'])
274
 
        self.assertEqual(b'', out)
 
274
        self.assertEqual('', out)
275
275
 
276
276
    def test_annotate_empty_file_show_ids(self):
277
277
        tree = self.make_branch_and_tree('.')
279
279
        tree.add('empty')
280
280
        tree.commit('add empty file')
281
281
        out, err = self.run_bzr(['annotate', '--show-ids', 'empty'])
282
 
        self.assertEqual(b'', out)
 
282
        self.assertEqual('', out)
283
283
 
284
284
    def test_annotate_nonexistant_file(self):
285
285
        tree = self.make_branch_and_tree('.')
287
287
        tree.add(['file'])
288
288
        tree.commit('add a file')
289
289
        out, err = self.run_bzr(['annotate', 'doesnotexist'], retcode=3)
290
 
        self.assertEqual(b'', out)
291
 
        self.assertEqual(b"brz: ERROR: doesnotexist is not versioned.\n", err)
 
290
        self.assertEqual('', out)
 
291
        self.assertEqual("brz: ERROR: doesnotexist is not versioned.\n", err)
292
292
 
293
293
    def test_annotate_without_workingtree(self):
294
294
        tree = self.make_branch_and_tree('.')
299
299
        bzrdir.destroy_workingtree()
300
300
        self.assertFalse(bzrdir.has_workingtree())
301
301
        out, err = self.run_bzr(['annotate', 'empty'])
302
 
        self.assertEqual(b'', out)
 
302
        self.assertEqual('', out)
303
303
 
304
304
    def test_annotate_directory(self):
305
305
        """Test --directory option"""