/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_serve.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_serve.py
129
129
            'test_server_except_hook hook')
130
130
        args = ['--listen', 'localhost', '--port', '0', '--quiet']
131
131
        out, err = self.run_bzr_serve_then_func(args, retcode=0)
132
 
        self.assertEqual(b'catching KeyboardInterrupt\n', err)
 
132
        self.assertEqual('catching KeyboardInterrupt\n', err)
133
133
 
134
134
    def test_server_exception_no_hook(self):
135
135
        """test exception without hook returns error"""
207
207
        self.make_branch('.')
208
208
        args = ['--listen', 'localhost', '--port', '0', '--quiet']
209
209
        out, err = self.run_bzr_serve_then_func(args, retcode=3)
210
 
        self.assertEqual(b'', out)
211
 
        self.assertEqual(b'', err)
 
210
        self.assertEqual('', out)
 
211
        self.assertEqual('', err)
212
212
 
213
213
    def test_bzr_serve_inet_readonly(self):
214
214
        """brz server should provide a read only filesystem by default."""