/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: Jelmer Vernooij
  • Date: 2018-07-15 18:45:17 UTC
  • mto: (7045.3.3 python3-r)
  • mto: This revision was merged to the branch mainline in revision 7047.
  • Revision ID: jelmer@jelmer.uk-20180715184517-1ipa50jg36zvglc5
Fix another 300 tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_commit.py
31
31
    msgeditor,
32
32
    )
33
33
from ...controldir import ControlDir
 
34
from ...sixish import PY3
34
35
from .. import (
35
36
    test_foreign,
36
37
    features,
145
146
        out, err = self.run_bzr(['commit', '-m', file_name])
146
147
        reflags = re.MULTILINE|re.DOTALL|re.UNICODE
147
148
        te = osutils.get_terminal_encoding()
148
 
        self.assertContainsRe(err.decode(te),
 
149
        self.assertContainsRe(err if PY3 else err.decode(te),
149
150
            u'The commit message is a file name:',
150
151
            flags=reflags)
151
152
 
164
165
            out, err = self.run_bzr(['commit', '-m', file_name])
165
166
            reflags = re.MULTILINE|re.DOTALL|re.UNICODE
166
167
            te = osutils.get_terminal_encoding()
167
 
            self.assertContainsRe(err.decode(te, 'replace'),
 
168
            self.assertContainsRe(err if PY3 else err.decode(te, 'replace'),
168
169
                u'The commit message is a file name:',
169
170
                flags=reflags)
170
171
        finally:
477
478
                              working_dir='dir-a')[1]
478
479
        self.assertNotContainsRe(result, 'file-a')
479
480
        result = self.run_bzr('status', working_dir='dir-a')[0]
480
 
        self.assertContainsRe(result, b'removed:\n  file-a')
 
481
        self.assertContainsRe(result, 'removed:\n  file-a')
481
482
 
482
483
    def test_strict_commit(self):
483
484
        """Commit with --strict works if everything is known"""
546
547
            encoding='utf-8', retcode=3)
547
548
        self.assertEqual('', output)
548
549
        self.assertContainsRe(err,
549
 
            b'brz: ERROR: Unrecognized bug generic:\xe2\x82\xac\\. Commit refused.\n')
 
550
            'brz: ERROR: Unrecognized bug generic:\xe2\x82\xac\\. Commit refused.\n')
550
551
 
551
552
    def test_no_bugs_no_properties(self):
552
553
        """If no bugs are fixed, the bugs property is not set.
778
779
        out, err = self.run_bzr(['commit', '--unchanged', '-mfoo', 'checkout'],
779
780
            retcode=3)
780
781
        self.assertContainsRe(err,
781
 
            br'^brz: ERROR: Cannot lock.*readonly transport')
 
782
            r'^brz: ERROR: Cannot lock.*readonly transport')
782
783
 
783
784
    def setup_editor(self):
784
785
        # Test that commit template hooks work