/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-02-07 02:14:30 UTC
  • mto: This revision was merged to the branch mainline in revision 7492.
  • Revision ID: jelmer@jelmer.uk-20200207021430-m49iq3x4x8xlib6x
Drop python2 support.

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
23
22
from breezy.tests import script, features
24
23
 
25
24
 
98
97
        make_tree_with_conflicts(self, "branch", prefix=u"\xA7")
99
98
        out, err = self.run_bzr(["conflicts", "-d", "branch"],
100
99
                                encoding=self.encoding)
101
 
        self.assertEqual(out if PY3 else out.decode(self.encoding),
 
100
        self.assertEqual(out,
102
101
                         u"Text conflict in \xA7_other_file\n"
103
102
                         u"Path conflict: \xA7dir3 / \xA7dir2\n"
104
103
                         u"Text conflict in \xA7file\n")
109
108
        make_tree_with_conflicts(self, "branch", prefix=u"\xA7")
110
109
        out, err = self.run_bzr(["conflicts", "-d", "branch", "--text"],
111
110
                                encoding=self.encoding)
112
 
        self.assertEqual(out if PY3 else out.decode(self.encoding),
 
111
        self.assertEqual(out,
113
112
                         u"\xA7_other_file\n"
114
113
                         u"\xA7file\n")
115
114
        self.assertEqual(err, "")