/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-07-05 12:50:01 UTC
  • mfrom: (7490.40.46 work)
  • mto: (7490.40.48 work)
  • mto: This revision was merged to the branch mainline in revision 7519.
  • Revision ID: jelmer@jelmer.uk-20200705125001-7s3vo0p55szbbws7
Merge lp:brz/3.1.

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,
 
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,
 
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:
186
187
        tree.add(["f"])
187
188
        out, err = self.run_bzr_raw(["commit", "-m", "Wrong filename", u"\xa7"],
188
189
                                    encoding="iso-8859-5", retcode=3)
189
 
        self.assertNotContainsString(err, b"\xc2\xa7")
 
190
        if not PY3:
 
191
            self.expectFailure("Error messages are always written as UTF-8",
 
192
                               self.assertNotContainsString, err, b"\xc2\xa7")
 
193
        else:
 
194
            self.assertNotContainsString(err, b"\xc2\xa7")
190
195
        self.assertContainsRe(err, b"(?m)not versioned: \"\xfd\"$")
191
196
 
192
197
    def test_warn_about_forgotten_commit_message(self):