/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: 2018-08-13 01:38:21 UTC
  • mto: This revision was merged to the branch mainline in revision 7078.
  • Revision ID: jelmer@jelmer.uk-20180813013821-ftxhownoxs1l55qs
Fix some more tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_commit.py
176
176
        tree = self.make_branch_and_tree(".")
177
177
        self.build_tree(["f"])
178
178
        tree.add(["f"])
179
 
        out, err = self.run_bzr(["commit", "-m", "Wrong filename", u"\xa7"],
 
179
        out, err = self.run_bzr_raw(["commit", "-m", "Wrong filename", u"\xa7"],
180
180
            encoding="utf-8", retcode=3)
181
 
        self.assertContainsRe(err, "(?m)not versioned: \"\xc2\xa7\"$")
 
181
        self.assertContainsRe(err, b"(?m)not versioned: \"\xc2\xa7\"$")
182
182
 
183
183
    def test_non_ascii_file_unversioned_iso_8859_5(self):
184
184
        self.requireFeature(features.UnicodeFilenameFeature)
185
185
        tree = self.make_branch_and_tree(".")
186
186
        self.build_tree(["f"])
187
187
        tree.add(["f"])
188
 
        out, err = self.run_bzr(["commit", "-m", "Wrong filename", u"\xa7"],
 
188
        out, err = self.run_bzr_raw(["commit", "-m", "Wrong filename", u"\xa7"],
189
189
            encoding="iso-8859-5", retcode=3)
190
 
        self.expectFailure("Error messages are always written as UTF-8",
191
 
            self.assertNotContainsString, err, "\xc2\xa7")
192
 
        self.assertContainsRe(err, "(?m)not versioned: \"\xfd\"$")
 
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")
 
195
        self.assertContainsRe(err, b"(?m)not versioned: \"\xfd\"$")
193
196
 
194
197
    def test_warn_about_forgotten_commit_message(self):
195
198
        """Test that the lack of -m parameter is caught"""
541
544
        tree = self.make_branch_and_tree('tree')
542
545
        self.build_tree(['tree/hello.txt'])
543
546
        tree.add('hello.txt')
544
 
        output, err = self.run_bzr(
 
547
        output, err = self.run_bzr_raw(
545
548
            ['commit', '-m', 'hello',
546
549
             u'--fixes=generic:\u20ac', 'tree/hello.txt'],
547
550
            encoding='utf-8', retcode=3)
548
 
        self.assertEqual('', output)
 
551
        self.assertEqual(b'', output)
549
552
        self.assertContainsRe(err,
550
 
            'brz: ERROR: Unrecognized bug generic:\xe2\x82\xac\\. Commit refused.\n')
 
553
            b'brz: ERROR: Unrecognized bug generic:\xe2\x82\xac\\. Commit refused.\n')
551
554
 
552
555
    def test_no_bugs_no_properties(self):
553
556
        """If no bugs are fixed, the bugs property is not set.