/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_reference.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_reference.py
64
64
    def test_one_arg_displays(self):
65
65
        tree = self.make_tree_with_reference()
66
66
        out, err = self.run_bzr('reference newpath', working_dir='tree')
67
 
        self.assertEqual(b'newpath http://example.org\n', out)
 
67
        self.assertEqual('newpath http://example.org\n', out)
68
68
 
69
69
    def test_one_arg_uses_containing_tree(self):
70
70
        tree = self.make_tree_with_reference()
71
71
        out, err = self.run_bzr('reference tree/newpath')
72
 
        self.assertEqual(b'newpath http://example.org\n', out)
 
72
        self.assertEqual('newpath http://example.org\n', out)
73
73
 
74
74
    def test_two_args_sets(self):
75
75
        tree = self.make_branch_and_tree('tree')
79
79
        location, file_id = tree.branch.get_reference_info('file')
80
80
        self.assertEqual('http://example.org', location)
81
81
        self.assertEqual(b'file-id', file_id)
82
 
        self.assertEqual(b'', out)
83
 
        self.assertEqual(b'', err)
 
82
        self.assertEqual('', out)
 
83
        self.assertEqual('', err)
84
84
 
85
85
    def test_missing_file(self):
86
86
        tree = self.make_branch_and_tree('tree')
87
87
        out, err = self.run_bzr('reference file http://example.org',
88
88
                                working_dir='tree', retcode=3)
89
 
        self.assertEqual(b'brz: ERROR: file is not versioned.\n', err)
 
89
        self.assertEqual('brz: ERROR: file is not versioned.\n', err)