/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-03 01:51:19 UTC
  • mfrom: (6973.14.14 python3-m)
  • Revision ID: breezy.the.bot@gmail.com-20180703015119-8wqoc0wqw45irl6r
Fix more tests on Python3.

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

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_commit.py
177
177
        tree.add(["f"])
178
178
        out, err = self.run_bzr(["commit", "-m", "Wrong filename", u"\xa7"],
179
179
            encoding="utf-8", retcode=3)
180
 
        self.assertContainsRe(err, "(?m)not versioned: \"\xc2\xa7\"$")
 
180
        self.assertContainsRe(err, b"(?m)not versioned: \"\xc2\xa7\"$")
181
181
 
182
182
    def test_non_ascii_file_unversioned_iso_8859_5(self):
183
183
        self.requireFeature(features.UnicodeFilenameFeature)
188
188
            encoding="iso-8859-5", retcode=3)
189
189
        self.expectFailure("Error messages are always written as UTF-8",
190
190
            self.assertNotContainsString, err, "\xc2\xa7")
191
 
        self.assertContainsRe(err, "(?m)not versioned: \"\xfd\"$")
 
191
        self.assertContainsRe(err, b"(?m)not versioned: \"\xfd\"$")
192
192
 
193
193
    def test_warn_about_forgotten_commit_message(self):
194
194
        """Test that the lack of -m parameter is caught"""
196
196
        self.build_tree(['one', 'two'])
197
197
        wt.add(['two'])
198
198
        out, err = self.run_bzr('commit -m one two')
199
 
        self.assertContainsRe(err, "The commit message is a file name")
 
199
        self.assertContainsRe(err, b"The commit message is a file name")
200
200
 
201
201
    def test_verbose_commit_renamed(self):
202
202
        # Verbose commit of renamed file should say so
778
778
        out, err = self.run_bzr(['commit', '--unchanged', '-mfoo', 'checkout'],
779
779
            retcode=3)
780
780
        self.assertContainsRe(err,
781
 
            r'^brz: ERROR: Cannot lock.*readonly transport')
 
781
            br'^brz: ERROR: Cannot lock.*readonly transport')
782
782
 
783
783
    def setup_editor(self):
784
784
        # Test that commit template hooks work
809
809
        out, err = self.run_bzr("commit tree/hello.txt", retcode=3,
810
810
            stdin="y\n")
811
811
        self.assertContainsRe(err,
812
 
            "brz: ERROR: Empty commit message specified")
 
812
            b"brz: ERROR: Empty commit message specified")
813
813
 
814
814
    def test_commit_hook_template_accepted(self):
815
815
        tree = self.setup_commit_with_template()