/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: 2020-02-07 02:14:30 UTC
  • mto: This revision was merged to the branch mainline in revision 7492.
  • Revision ID: jelmer@jelmer.uk-20200207021430-m49iq3x4x8xlib6x
Drop python2 support.

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
35
34
from .. import (
36
35
    test_foreign,
37
36
    features,
147
146
        out, err = self.run_bzr(['commit', '-m', file_name])
148
147
        reflags = re.MULTILINE | re.DOTALL | re.UNICODE
149
148
        te = osutils.get_terminal_encoding()
150
 
        self.assertContainsRe(err if PY3 else err.decode(te),
 
149
        self.assertContainsRe(err,
151
150
                              u'The commit message is a file name:',
152
151
                              flags=reflags)
153
152
 
166
165
            out, err = self.run_bzr(['commit', '-m', file_name])
167
166
            reflags = re.MULTILINE | re.DOTALL | re.UNICODE
168
167
            te = osutils.get_terminal_encoding()
169
 
            self.assertContainsRe(err if PY3 else err.decode(te, 'replace'),
 
168
            self.assertContainsRe(err,
170
169
                                  u'The commit message is a file name:',
171
170
                                  flags=reflags)
172
171
        finally:
188
187
        tree.add(["f"])
189
188
        out, err = self.run_bzr_raw(["commit", "-m", "Wrong filename", u"\xa7"],
190
189
                                    encoding="iso-8859-5", retcode=3)
191
 
        if not PY3:
192
 
            self.expectFailure("Error messages are always written as UTF-8",
193
 
                               self.assertNotContainsString, err, b"\xc2\xa7")
194
 
        else:
195
 
            self.assertNotContainsString(err, b"\xc2\xa7")
 
190
        self.assertNotContainsString(err, b"\xc2\xa7")
196
191
        self.assertContainsRe(err, b"(?m)not versioned: \"\xfd\"$")
197
192
 
198
193
    def test_warn_about_forgotten_commit_message(self):