/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: 2017-06-08 23:30:31 UTC
  • mto: This revision was merged to the branch mainline in revision 6690.
  • Revision ID: jelmer@jelmer.uk-20170608233031-3qavls2o7a1pqllj
Update imports.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_conflicts.py
23
23
 
24
24
 
25
25
def make_tree_with_conflicts(test, this_path='this', other_path='other',
26
 
                             prefix='my'):
 
26
        prefix='my'):
27
27
    this_tree = test.make_branch_and_tree(this_path)
28
28
    test.build_tree_contents([
29
 
        ('%s/%sfile' % (this_path, prefix), b'this content\n'),
30
 
        ('%s/%s_other_file' % (this_path, prefix), b'this content\n'),
 
29
        ('%s/%sfile' % (this_path, prefix), 'this content\n'),
 
30
        ('%s/%s_other_file' % (this_path, prefix), 'this content\n'),
31
31
        ('%s/%sdir/' % (this_path, prefix),),
32
32
        ])
33
 
    this_tree.add(prefix + 'file')
34
 
    this_tree.add(prefix + '_other_file')
35
 
    this_tree.add(prefix + 'dir')
 
33
    this_tree.add(prefix+'file')
 
34
    this_tree.add(prefix+'_other_file')
 
35
    this_tree.add(prefix+'dir')
36
36
    this_tree.commit(message="new")
37
 
    other_tree = this_tree.controldir.sprout(other_path).open_workingtree()
 
37
    other_tree = this_tree.bzrdir.sprout(other_path).open_workingtree()
38
38
    test.build_tree_contents([
39
 
        ('%s/%sfile' % (other_path, prefix), b'contentsb\n'),
40
 
        ('%s/%s_other_file' % (other_path, prefix), b'contentsb\n'),
 
39
        ('%s/%sfile' % (other_path, prefix), 'contentsb\n'),
 
40
        ('%s/%s_other_file' % (other_path, prefix), 'contentsb\n'),
41
41
        ])
42
 
    other_tree.rename_one(prefix + 'dir', prefix + 'dir2')
 
42
    other_tree.rename_one(prefix+'dir', prefix+'dir2')
43
43
    other_tree.commit(message="change")
44
44
    test.build_tree_contents([
45
 
        ('%s/%sfile' % (this_path, prefix), b'contentsa2\n'),
46
 
        ('%s/%s_other_file' % (this_path, prefix), b'contentsa2\n'),
 
45
        ('%s/%sfile' % (this_path, prefix), 'contentsa2\n'),
 
46
        ('%s/%s_other_file' % (this_path, prefix), 'contentsa2\n'),
47
47
        ])
48
 
    this_tree.rename_one(prefix + 'dir', prefix + 'dir3')
 
48
    this_tree.rename_one(prefix+'dir', prefix+'dir3')
49
49
    this_tree.commit(message='change')
50
50
    this_tree.merge_from_branch(other_tree.branch)
51
51
    return this_tree, other_tree
96
96
        """Conflict messages involving non-ascii paths are displayed okay"""
97
97
        make_tree_with_conflicts(self, "branch", prefix=u"\xA7")
98
98
        out, err = self.run_bzr(["conflicts", "-d", "branch"],
99
 
                                encoding=self.encoding)
100
 
        self.assertEqual(out,
101
 
                         u"Text conflict in \xA7_other_file\n"
102
 
                         u"Path conflict: \xA7dir3 / \xA7dir2\n"
103
 
                         u"Text conflict in \xA7file\n")
 
99
            encoding=self.encoding)
 
100
        self.assertEqual(out.decode(self.encoding),
 
101
            u"Text conflict in \xA7_other_file\n"
 
102
            u"Path conflict: \xA7dir3 / \xA7dir2\n"
 
103
            u"Text conflict in \xA7file\n")
104
104
        self.assertEqual(err, "")
105
105
 
106
106
    def test_text_conflict_paths(self):
107
107
        """Text conflicts on non-ascii paths are displayed okay"""
108
108
        make_tree_with_conflicts(self, "branch", prefix=u"\xA7")
109
109
        out, err = self.run_bzr(["conflicts", "-d", "branch", "--text"],
110
 
                                encoding=self.encoding)
111
 
        self.assertEqual(out,
112
 
                         u"\xA7_other_file\n"
113
 
                         u"\xA7file\n")
 
110
            encoding=self.encoding)
 
111
        self.assertEqual(out.decode(self.encoding),
 
112
            u"\xA7_other_file\n"
 
113
            u"\xA7file\n")
114
114
        self.assertEqual(err, "")
115
115
 
116
116