/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_help.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-07-14 19:47:11 UTC
  • mfrom: (7027.4.12 python3-blackbox)
  • Revision ID: breezy.the.bot@gmail.com-20180714194711-h73vd0gzphiab6vf
Change run_bzr to use StringIOWithEncoding for stderr and stdout on python 3.

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

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_help.py
78
78
        out, err = self.run_bzr('help repositories')
79
79
        from breezy.help_topics import help_as_plain_text, _repositories
80
80
        expected = help_as_plain_text(_repositories)
81
 
        self.assertEqual(expected, out)
 
81
        self.assertEqual(expected.encode('utf-8'), out)
82
82
 
83
83
    def test_help_working_trees(self):
84
84
        """Smoke test for 'brz help working-trees'"""
188
188
 
189
189
    def test_help_command_utf8(self):
190
190
        out, err = self.run_bzr(["help", "push"], encoding="utf-8")
191
 
        self.assertContainsRe(out, "zz\xc3\xa5{{:See also:")
 
191
        self.assertContainsRe(out, b"zz\xc3\xa5{{:See also:")
192
192
 
193
193
    def test_help_switch_utf8(self):
194
194
        out, err = self.run_bzr(["push", "--help"], encoding="utf-8")
195
 
        self.assertContainsRe(out, "zz\xc3\xa5{{:See also:")
 
195
        self.assertContainsRe(out, b"zz\xc3\xa5{{:See also:")
196
196
 
197
197
    def test_help_command_ascii(self):
198
198
        out, err = self.run_bzr(["help", "push"], encoding="ascii")
199
 
        self.assertContainsRe(out, "zz\\?{{:See also:")
 
199
        self.assertContainsRe(out, b"zz\\?{{:See also:")
200
200
 
201
201
    def test_help_switch_ascii(self):
202
202
        out, err = self.run_bzr(["push", "--help"], encoding="ascii")
203
 
        self.assertContainsRe(out, "zz\\?{{:See also:")
 
203
        self.assertContainsRe(out, b"zz\\?{{:See also:")