← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_conflicts.py

Merge cleanup into description

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_conflicts.py
1
 
# Copyright (C) 2006 Canonical Ltd
 
1
# Copyright (C) 2006, 2009 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
 
import os
18
 
 
19
17
from bzrlib import (
20
18
    conflicts,
21
 
    errors,
22
19
    tests,
23
20
    workingtree,
24
21
    )
26
23
# FIXME: These don't really look at the output of the conflict commands, just
27
24
# the number of lines - there should be more examination.
28
25
 
29
 
class TestMixin(object):
 
26
class TestConflictsBase(tests.TestCaseWithTransport):
 
27
 
 
28
    def setUp(self):
 
29
        super(TestConflictsBase, self).setUp()
 
30
        self.make_tree_with_conflicts()
30
31
 
31
32
    def make_tree_with_conflicts(self):
32
33
        a_tree = self.make_branch_and_tree('a')
53
54
        a_tree.rename_one('mydir', 'mydir3')
54
55
        a_tree.commit(message='change')
55
56
        a_tree.merge_from_branch(b_tree.branch)
56
 
        os.chdir('a')
57
 
 
58
 
 
59
 
class TestConflicts(tests.TestCaseWithTransport, TestMixin):
60
 
 
61
 
    def setUp(self):
62
 
        super(TestConflicts, self).setUp()
63
 
        self.make_tree_with_conflicts()
 
57
 
 
58
    def run_bzr(self, cmd, working_dir='a', **kwargs):
 
59
        return super(TestConflictsBase, self).run_bzr(
 
60
            cmd, working_dir=working_dir, **kwargs)
 
61
 
 
62
 
 
63
class TestConflicts(TestConflictsBase):
64
64
 
65
65
    def test_conflicts(self):
66
 
        conflicts, errs = self.run_bzr('conflicts')
67
 
        self.assertEqual(3, len(conflicts.splitlines()))
 
66
        out, err = self.run_bzr('conflicts')
 
67
        self.assertEqual(3, len(out.splitlines()))
68
68
 
69
69
    def test_conflicts_text(self):
70
 
        conflicts = self.run_bzr('conflicts --text')[0].splitlines()
71
 
        self.assertEqual(['my_other_file', 'myfile'], conflicts)
72
 
 
73
 
 
74
 
class TestResolve(tests.TestCaseWithTransport, TestMixin):
75
 
 
76
 
    def setUp(self):
77
 
        super(TestResolve, self).setUp()
78
 
        self.make_tree_with_conflicts()
 
70
        lines = self.run_bzr('conflicts --text')[0].splitlines()
 
71
        self.assertEqual(['my_other_file', 'myfile'], lines)
 
72
 
 
73
 
 
74
class TestResolve(TestConflictsBase):
79
75
 
80
76
    def test_resolve(self):
81
77
        self.run_bzr('resolve myfile')
82
 
        conflicts, errs = self.run_bzr('conflicts')
83
 
        self.assertEqual(2, len(conflicts.splitlines()))
 
78
        out, err = self.run_bzr('conflicts')
 
79
        self.assertEqual(2, len(out.splitlines()))
84
80
        self.run_bzr('resolve my_other_file')
85
81
        self.run_bzr('resolve mydir2')
86
 
        conflicts, errs = self.run_bzr('conflicts')
87
 
        self.assertEqual(len(conflicts.splitlines()), 0)
 
82
        out, err = self.run_bzr('conflicts')
 
83
        self.assertEqual(0, len(out.splitlines()))
88
84
 
89
85
    def test_resolve_all(self):
90
86
        self.run_bzr('resolve --all')
91
 
        conflicts, errs = self.run_bzr('conflicts')
92
 
        self.assertEqual(len(conflicts.splitlines()), 0)
 
87
        out, err = self.run_bzr('conflicts')
 
88
        self.assertEqual(0, len(out.splitlines()))
93
89
 
94
90
    def test_resolve_in_subdir(self):
95
91
        """resolve when run from subdirectory should handle relative paths"""
96
 
        os.mkdir("subdir")
97
 
        os.chdir("subdir")
98
 
        self.run_bzr("resolve ../myfile")
99
 
        os.chdir("../../b")
100
 
        self.run_bzr("resolve ../a/myfile")
101
 
        wt = workingtree.WorkingTree.open_containing('.')[0]
 
92
        self.build_tree(["a/subdir/"])
 
93
        self.run_bzr("resolve ../myfile", working_dir='a/subdir')
 
94
        self.run_bzr("resolve ../a/myfile", working_dir='b')
 
95
        wt = workingtree.WorkingTree.open_containing('b')[0]
102
96
        conflicts = wt.conflicts()
103
97
        if not conflicts.is_empty():
104
98
            self.fail("tree still contains conflicts: %r" % conflicts)
112
106
        self.assertEqual(tree.kind('file_id'), 'file')
113
107
        file_conflict = conflicts.TextConflict('file', file_id='file_id')
114
108
        tree.set_conflicts(conflicts.ConflictList([file_conflict]))
115
 
        os.chdir('tree')
116
 
        note = self.run_bzr('resolve', retcode=1)[1]
 
109
        note = self.run_bzr('resolve', retcode=1, working_dir='tree')[1]
117
110
        self.assertContainsRe(note, '0 conflict\\(s\\) auto-resolved.')
118
111
        self.assertContainsRe(note,
119
112
            'Remaining conflicts:\nText conflict in file')
120
 
        self.build_tree_contents([('file', 'a\n')])
121
 
        note = self.run_bzr('resolve')[1]
 
113
        self.build_tree_contents([('tree/file', 'a\n')])
 
114
        note = self.run_bzr('resolve', working_dir='tree')[1]
122
115
        self.assertContainsRe(note, 'All conflicts resolved.')