/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_commit.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_commit.py
47
47
        self.make_branch_and_tree('.')
48
48
        self.build_tree(['hello.txt'])
49
49
        out, err = self.run_bzr('commit -m empty', retcode=3)
50
 
        self.assertEqual(b'', out)
 
50
        self.assertEqual('', out)
51
51
        # Two ugly bits here.
52
52
        # 1) We really don't want 'aborting commit write group' anymore.
53
53
        # 2) brz: ERROR: is a really long line, so we wrap it with '\'
109
109
        self.build_tree(['hello.txt'])
110
110
        tree.add("hello.txt")
111
111
        out, err = self.run_bzr('commit -m added')
112
 
        self.assertEqual(b'', out)
113
 
        self.assertContainsRe(err, b'^Committing to: .*\n'
114
 
                              b'added hello.txt\n'
115
 
                              b'Committed revision 1.\n$',)
 
112
        self.assertEqual('', out)
 
113
        self.assertContainsRe(err, '^Committing to: .*\n'
 
114
                              'added hello.txt\n'
 
115
                              'Committed revision 1.\n$',)
116
116
 
117
117
    def prepare_simple_history(self):
118
118
        """Prepare and return a working tree with one commit of one file"""
128
128
        wt = self.prepare_simple_history()
129
129
        self.build_tree_contents([('hello.txt', b'new contents')])
130
130
        out, err = self.run_bzr('commit -m modified')
131
 
        self.assertEqual(b'', out)
132
 
        self.assertContainsRe(err, b'^Committing to: .*\n'
133
 
                              b'modified hello\\.txt\n'
134
 
                              b'Committed revision 2\\.\n$')
 
131
        self.assertEqual('', out)
 
132
        self.assertContainsRe(err, '^Committing to: .*\n'
 
133
                              'modified hello\\.txt\n'
 
134
                              'Committed revision 2\\.\n$')
135
135
 
136
136
    def test_unicode_commit_message_is_filename(self):
137
137
        """Unicode commit message same as a filename (Bug #563646).
177
177
        tree.add(["f"])
178
178
        out, err = self.run_bzr(["commit", "-m", "Wrong filename", u"\xa7"],
179
179
            encoding="utf-8", retcode=3)
180
 
        self.assertContainsRe(err, b"(?m)not versioned: \"\xc2\xa7\"$")
 
180
        self.assertContainsRe(err, "(?m)not versioned: \"\xc2\xa7\"$")
181
181
 
182
182
    def test_non_ascii_file_unversioned_iso_8859_5(self):
183
183
        self.requireFeature(features.UnicodeFilenameFeature)
188
188
            encoding="iso-8859-5", retcode=3)
189
189
        self.expectFailure("Error messages are always written as UTF-8",
190
190
            self.assertNotContainsString, err, "\xc2\xa7")
191
 
        self.assertContainsRe(err, b"(?m)not versioned: \"\xfd\"$")
 
191
        self.assertContainsRe(err, "(?m)not versioned: \"\xfd\"$")
192
192
 
193
193
    def test_warn_about_forgotten_commit_message(self):
194
194
        """Test that the lack of -m parameter is caught"""
196
196
        self.build_tree(['one', 'two'])
197
197
        wt.add(['two'])
198
198
        out, err = self.run_bzr('commit -m one two')
199
 
        self.assertContainsRe(err, b"The commit message is a file name")
 
199
        self.assertContainsRe(err, "The commit message is a file name")
200
200
 
201
201
    def test_verbose_commit_renamed(self):
202
202
        # Verbose commit of renamed file should say so
203
203
        wt = self.prepare_simple_history()
204
204
        wt.rename_one('hello.txt', 'gutentag.txt')
205
205
        out, err = self.run_bzr('commit -m renamed')
206
 
        self.assertEqual(b'', out)
207
 
        self.assertContainsRe(err, b'^Committing to: .*\n'
208
 
                              b'renamed hello\\.txt => gutentag\\.txt\n'
209
 
                              b'Committed revision 2\\.$\n')
 
206
        self.assertEqual('', out)
 
207
        self.assertContainsRe(err, '^Committing to: .*\n'
 
208
                              'renamed hello\\.txt => gutentag\\.txt\n'
 
209
                              'Committed revision 2\\.$\n')
210
210
 
211
211
    def test_verbose_commit_moved(self):
212
212
        # Verbose commit of file moved to new directory should say so
215
215
        wt.add(['subdir'])
216
216
        wt.rename_one('hello.txt', 'subdir/hello.txt')
217
217
        out, err = self.run_bzr('commit -m renamed')
218
 
        self.assertEqual(b'', out)
 
218
        self.assertEqual('', out)
219
219
        self.assertEqual({
220
 
            b'Committing to: %s/' % osutils.getcwd(),
221
 
            b'added subdir',
222
 
            b'renamed hello.txt => subdir/hello.txt',
223
 
            b'Committed revision 2.',
224
 
            b'',
 
220
            'Committing to: %s/' % osutils.getcwd(),
 
221
            'added subdir',
 
222
            'renamed hello.txt => subdir/hello.txt',
 
223
            'Committed revision 2.',
 
224
            '',
225
225
            }, set(err.split('\n')))
226
226
 
227
227
    def test_verbose_commit_with_unknown(self):
231
231
        self.build_tree(['hello.txt', 'extra.txt'])
232
232
        wt.add(['hello.txt'])
233
233
        out, err = self.run_bzr('commit -m added')
234
 
        self.assertEqual(b'', out)
235
 
        self.assertContainsRe(err, b'^Committing to: .*\n'
236
 
                              b'added hello\\.txt\n'
237
 
                              b'Committed revision 1\\.\n$')
 
234
        self.assertEqual('', out)
 
235
        self.assertContainsRe(err, '^Committing to: .*\n'
 
236
                              'added hello\\.txt\n'
 
237
                              'Committed revision 1\\.\n$')
238
238
 
239
239
    def test_verbose_commit_with_unchanged(self):
240
240
        """Unchanged files should not be listed by default in verbose output"""
244
244
        self.run_bzr('commit -m unchanged unchanged.txt')
245
245
        tree.add("hello.txt")
246
246
        out, err = self.run_bzr('commit -m added')
247
 
        self.assertEqual(b'', out)
248
 
        self.assertContainsRe(err, b'^Committing to: .*\n'
249
 
                              b'added hello\\.txt\n'
250
 
                              b'Committed revision 2\\.$\n')
 
247
        self.assertEqual('', out)
 
248
        self.assertContainsRe(err, '^Committing to: .*\n'
 
249
                              'added hello\\.txt\n'
 
250
                              'Committed revision 2\\.$\n')
251
251
 
252
252
    def test_verbose_commit_includes_master_location(self):
253
253
        """Location of master is displayed when committing to bound branch"""
331
331
            other_tree.unlock()
332
332
        this_tree.merge_from_branch(other_tree.branch)
333
333
        out, err = self.run_bzr('commit -m added', working_dir='this')
334
 
        self.assertEqual(b'', out)
 
334
        self.assertEqual('', out)
335
335
        self.assertEqual({
336
 
            b'Committing to: %s/' % osutils.pathjoin(osutils.getcwd().encode('utf-8'), 'this'),
337
 
            b'modified filetomodify',
338
 
            b'added newdir',
339
 
            b'added newfile',
340
 
            b'renamed dirtorename => renameddir',
341
 
            b'renamed filetorename => renamedfile',
342
 
            b'renamed dirtoreparent => renameddir/reparenteddir',
343
 
            b'renamed filetoreparent => renameddir/reparentedfile',
344
 
            b'deleted dirtoremove',
345
 
            b'deleted filetoremove',
346
 
            b'Committed revision 2.',
347
 
            b''
348
 
            }, set(err.split(b'\n')))
 
336
            'Committing to: %s/' % osutils.pathjoin(osutils.getcwd(), 'this'),
 
337
            'modified filetomodify',
 
338
            'added newdir',
 
339
            'added newfile',
 
340
            'renamed dirtorename => renameddir',
 
341
            'renamed filetorename => renamedfile',
 
342
            'renamed dirtoreparent => renameddir/reparenteddir',
 
343
            'renamed filetoreparent => renameddir/reparentedfile',
 
344
            'deleted dirtoremove',
 
345
            'deleted filetoremove',
 
346
            'Committed revision 2.',
 
347
            ''
 
348
            }, set(err.split('\n')))
349
349
 
350
350
    def test_empty_commit_message(self):
351
351
        tree = self.make_branch_and_tree('.')
369
369
        # can commit to branch - records bar.c
370
370
        self.run_bzr('commit -m newstuff branch')
371
371
        # No changes left
372
 
        self.run_bzr_error([b"No changes to commit"], 'commit -m newstuff branch')
 
372
        self.run_bzr_error(["No changes to commit"], 'commit -m newstuff branch')
373
373
 
374
374
    def test_out_of_date_tree_commit(self):
375
375
        # check we get an error code and a clear message committing with an out
443
443
        self.build_tree(['a', 'b', 'c'])
444
444
        tree.smart_add(['.'])
445
445
        out, err = self.run_bzr(['commit', '-m', 'test', '-x', 'b'])
446
 
        self.assertFalse(b'added b' in out)
447
 
        self.assertFalse(b'added b' in err)
 
446
        self.assertFalse('added b' in out)
 
447
        self.assertFalse('added b' in err)
448
448
        # If b was excluded it will still be 'added' in status.
449
449
        out, err = self.run_bzr(['added'])
450
 
        self.assertEqual(b'b\n', out)
451
 
        self.assertEqual(b'', err)
 
450
        self.assertEqual('b\n', out)
 
451
        self.assertEqual('', err)
452
452
 
453
453
    def test_commit_exclude_twice_uses_both_rules(self):
454
454
        """Commit -x foo -x bar should ignore changes to foo and bar."""
456
456
        self.build_tree(['a', 'b', 'c'])
457
457
        tree.smart_add(['.'])
458
458
        out, err = self.run_bzr(['commit', '-m', 'test', '-x', 'b', '-x', 'c'])
459
 
        self.assertFalse(b'added b' in out)
460
 
        self.assertFalse(b'added c' in out)
461
 
        self.assertFalse(b'added b' in err)
462
 
        self.assertFalse(b'added c' in err)
 
459
        self.assertFalse('added b' in out)
 
460
        self.assertFalse('added c' in out)
 
461
        self.assertFalse('added b' in err)
 
462
        self.assertFalse('added c' in err)
463
463
        # If b was excluded it will still be 'added' in status.
464
464
        out, err = self.run_bzr(['added'])
465
 
        self.assertTrue(b'b\n' in out)
466
 
        self.assertTrue(b'c\n' in out)
467
 
        self.assertEqual(b'', err)
 
465
        self.assertTrue('b\n' in out)
 
466
        self.assertTrue('c\n' in out)
 
467
        self.assertEqual('', err)
468
468
 
469
469
    def test_commit_respects_spec_for_removals(self):
470
470
        """Commit with a file spec should only commit removals that match"""
497
497
 
498
498
        # With no changes, it should just be 'no changes'
499
499
        # Make sure that commit is failing because there is nothing to do
500
 
        self.run_bzr_error([b'No changes to commit'],
 
500
        self.run_bzr_error(['No changes to commit'],
501
501
                           'commit --strict -m no-changes',
502
502
                           working_dir='tree')
503
503
 
515
515
        # Add one file so there is a change, but forget the other
516
516
        self.build_tree(['tree/b', 'tree/c'])
517
517
        tree.add('b')
518
 
        self.run_bzr_error([b'Commit refused because there are unknown files'],
 
518
        self.run_bzr_error(['Commit refused because there are unknown files'],
519
519
                           'commit --strict -m add-b',
520
520
                           working_dir='tree')
521
521
 
530
530
        tree.add('hello.txt')
531
531
        output, err = self.run_bzr(
532
532
            'commit -m hello --fixes=lp:23452 tree/hello.txt')
533
 
        self.assertEqual(b'', output)
534
 
        self.assertContainsRe(err, b'Committing to: .*\n'
535
 
                              b'added hello\\.txt\n'
536
 
                              b'Committed revision 1\\.\n')
 
533
        self.assertEqual('', output)
 
534
        self.assertContainsRe(err, 'Committing to: .*\n'
 
535
                              'added hello\\.txt\n'
 
536
                              'Committed revision 1\\.\n')
537
537
 
538
538
    def test_fixes_bug_unicode(self):
539
539
        """commit --fixes=lp:unicode succeeds without output."""
544
544
            ['commit', '-m', 'hello',
545
545
             u'--fixes=generic:\u20ac', 'tree/hello.txt'],
546
546
            encoding='utf-8', retcode=3)
547
 
        self.assertEqual(b'', output)
 
547
        self.assertEqual('', output)
548
548
        self.assertContainsRe(err,
549
549
            b'brz: ERROR: Unrecognized bug generic:\xe2\x82\xac\\. Commit refused.\n')
550
550
 
764
764
        self.build_tree_contents([('test', b'changes in test')])
765
765
        # partial commit
766
766
        out, err = self.run_bzr('commit test -m "partial commit"')
767
 
        self.assertEqual(b'', out)
768
 
        self.assertContainsRe(err, br'modified test\nCommitted revision 2.')
 
767
        self.assertEqual('', out)
 
768
        self.assertContainsRe(err, r'modified test\nCommitted revision 2.')
769
769
 
770
770
    def test_commit_readonly_checkout(self):
771
771
        # https://bugs.launchpad.net/bzr/+bug/129701
820
820
    def test_commit_hook_template_rejected(self):
821
821
        tree = self.setup_commit_with_template()
822
822
        expected = tree.last_revision()
823
 
        out, err = self.run_bzr_error([b"Empty commit message specified."
824
 
                  b" Please specify a commit message with either"
825
 
                  b" --message or --file or leave a blank message"
826
 
                  b" with --message \"\"."],
 
823
        out, err = self.run_bzr_error(["Empty commit message specified."
 
824
                  " Please specify a commit message with either"
 
825
                  " --message or --file or leave a blank message"
 
826
                  " with --message \"\"."],
827
827
            "commit tree/hello.txt", stdin="n\n")
828
828
        self.assertEqual(expected, tree.last_revision())
829
829