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

  • Committer: Jelmer Vernooij
  • Date: 2020-07-05 12:50:01 UTC
  • mfrom: (7490.40.46 work)
  • mto: (7490.40.48 work)
  • mto: This revision was merged to the branch mainline in revision 7519.
  • Revision ID: jelmer@jelmer.uk-20200705125001-7s3vo0p55szbbws7
Merge lp:brz/3.1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_conflicts.py
19
19
    tests,
20
20
    workingtree,
21
21
    )
 
22
from breezy.sixish import PY3
22
23
from breezy.tests import script, features
23
24
 
24
25
 
97
98
        make_tree_with_conflicts(self, "branch", prefix=u"\xA7")
98
99
        out, err = self.run_bzr(["conflicts", "-d", "branch"],
99
100
                                encoding=self.encoding)
100
 
        self.assertEqual(out,
 
101
        self.assertEqual(out if PY3 else out.decode(self.encoding),
101
102
                         u"Text conflict in \xA7_other_file\n"
102
103
                         u"Path conflict: \xA7dir3 / \xA7dir2\n"
103
104
                         u"Text conflict in \xA7file\n")
108
109
        make_tree_with_conflicts(self, "branch", prefix=u"\xA7")
109
110
        out, err = self.run_bzr(["conflicts", "-d", "branch", "--text"],
110
111
                                encoding=self.encoding)
111
 
        self.assertEqual(out,
 
112
        self.assertEqual(out if PY3 else out.decode(self.encoding),
112
113
                         u"\xA7_other_file\n"
113
114
                         u"\xA7file\n")
114
115
        self.assertEqual(err, "")