/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-15 17:06:25 UTC
  • mfrom: (7027.10.3 python3-blackbox-more)
  • Revision ID: breezy.the.bot@gmail.com-20180715170625-ucqimyum5g85letv
Fix some more blackbox tests on Python 3.

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

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_commit.py
477
477
                              working_dir='dir-a')[1]
478
478
        self.assertNotContainsRe(result, 'file-a')
479
479
        result = self.run_bzr('status', working_dir='dir-a')[0]
480
 
        self.assertContainsRe(result, b'removed:\n  file-a')
 
480
        self.assertContainsRe(result, 'removed:\n  file-a')
481
481
 
482
482
    def test_strict_commit(self):
483
483
        """Commit with --strict works if everything is known"""
546
546
            encoding='utf-8', retcode=3)
547
547
        self.assertEqual('', output)
548
548
        self.assertContainsRe(err,
549
 
            b'brz: ERROR: Unrecognized bug generic:\xe2\x82\xac\\. Commit refused.\n')
 
549
            'brz: ERROR: Unrecognized bug generic:\xe2\x82\xac\\. Commit refused.\n')
550
550
 
551
551
    def test_no_bugs_no_properties(self):
552
552
        """If no bugs are fixed, the bugs property is not set.
778
778
        out, err = self.run_bzr(['commit', '--unchanged', '-mfoo', 'checkout'],
779
779
            retcode=3)
780
780
        self.assertContainsRe(err,
781
 
            br'^brz: ERROR: Cannot lock.*readonly transport')
 
781
            r'^brz: ERROR: Cannot lock.*readonly transport')
782
782
 
783
783
    def setup_editor(self):
784
784
        # Test that commit template hooks work