/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-17 09:43:24 UTC
  • mfrom: (7045.1.9 python3-o)
  • Revision ID: breezy.the.bot@gmail.com-20180717094324-sejdvmx3kha2zeq8
Fix another ~500 tests on Python 3.

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

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: