/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-08-10 15:00:17 UTC
  • mfrom: (7490.40.99 work)
  • mto: This revision was merged to the branch mainline in revision 7521.
  • Revision ID: jelmer@jelmer.uk-20200810150017-vs7xnrd1vat4iktg
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
35
34
from .. import (
36
35
    test_foreign,
37
36
    features,
146
145
        out, err = self.run_bzr(['commit', '-m', file_name])
147
146
        reflags = re.MULTILINE | re.DOTALL | re.UNICODE
148
147
        te = osutils.get_terminal_encoding()
149
 
        self.assertContainsRe(err if PY3 else err.decode(te),
 
148
        self.assertContainsRe(err,
150
149
                              u'The commit message is a file name:',
151
150
                              flags=reflags)
152
151
 
165
164
            out, err = self.run_bzr(['commit', '-m', file_name])
166
165
            reflags = re.MULTILINE | re.DOTALL | re.UNICODE
167
166
            te = osutils.get_terminal_encoding()
168
 
            self.assertContainsRe(err if PY3 else err.decode(te, 'replace'),
 
167
            self.assertContainsRe(err,
169
168
                                  u'The commit message is a file name:',
170
169
                                  flags=reflags)
171
170
        finally:
187
186
        tree.add(["f"])
188
187
        out, err = self.run_bzr_raw(["commit", "-m", "Wrong filename", u"\xa7"],
189
188
                                    encoding="iso-8859-5", retcode=3)
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")
 
189
        self.assertNotContainsString(err, b"\xc2\xa7")
195
190
        self.assertContainsRe(err, b"(?m)not versioned: \"\xfd\"$")
196
191
 
197
192
    def test_warn_about_forgotten_commit_message(self):