/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_script.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_script.py
35
35
        self.build_tree_contents([('script', b'')])
36
36
        out, err = self.run_bzr(['test-script', 'script'])
37
37
        out_lines = out.splitlines()
38
 
        self.assertStartsWith(out_lines[-3], b'Ran 1 test in ')
39
 
        self.assertEqual(b'OK', out_lines[-1])
40
 
        self.assertEqual(b'', err)
 
38
        self.assertStartsWith(out_lines[-3], 'Ran 1 test in ')
 
39
        self.assertEqual('OK', out_lines[-1])
 
40
        self.assertEqual('', err)
41
41
 
42
42
    def test_simple_file(self):
43
43
        self.build_tree_contents([('script', b'''
46
46
''')])
47
47
        out, err = self.run_bzr(['test-script', 'script'])
48
48
        out_lines = out.splitlines()
49
 
        self.assertStartsWith(out_lines[-3], b'Ran 1 test in ')
50
 
        self.assertEqual(b'OK', out_lines[-1])
51
 
        self.assertEqual(b'', err)
 
49
        self.assertStartsWith(out_lines[-3], 'Ran 1 test in ')
 
50
        self.assertEqual('OK', out_lines[-1])
 
51
        self.assertEqual('', err)
52
52
 
53
53
    def test_null_output(self):
54
54
        self.build_tree_contents([('script', b'''
56
56
''')])
57
57
        out, err = self.run_bzr(['test-script', 'script', '--null-output'])
58
58
        out_lines = out.splitlines()
59
 
        self.assertStartsWith(out_lines[-3], b'Ran 1 test in ')
60
 
        self.assertEqual(b'OK', out_lines[-1])
61
 
        self.assertEqual(b'', err)
 
59
        self.assertStartsWith(out_lines[-3], 'Ran 1 test in ')
 
60
        self.assertEqual('OK', out_lines[-1])
 
61
        self.assertEqual('', err)
62
62
 
63
63
    def test_failing_script(self):
64
64
        self.build_tree_contents([('script', b'''
67
67
''')])
68
68
        out, err = self.run_bzr(['test-script', 'script'], retcode=1)
69
69
        out_lines = out.splitlines()
70
 
        self.assertStartsWith(out_lines[-3], b'Ran 1 test in ')
71
 
        self.assertEqual(b'FAILED (failures=1)', out_lines[-1])
72
 
        self.assertEqual(b'', err)
 
70
        self.assertStartsWith(out_lines[-3], 'Ran 1 test in ')
 
71
        self.assertEqual('FAILED (failures=1)', out_lines[-1])
 
72
        self.assertEqual('', err)