← 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

(igc) Desktop Guide link

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_conflicts.py
1
 
# Copyright (C) 2006, 2007, 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2006 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
 
17
19
from bzrlib import (
18
 
    conflicts,
19
 
    tests,
20
 
    workingtree,
 
20
    conflicts
21
21
    )
 
22
from bzrlib.workingtree import WorkingTree
 
23
from bzrlib.tests.blackbox import ExternalBase
22
24
 
23
25
# FIXME: These don't really look at the output of the conflict commands, just
24
26
# the number of lines - there should be more examination.
25
27
 
26
 
class TestConflictsBase(tests.TestCaseWithTransport):
 
28
class TestConflicts(ExternalBase):
27
29
 
28
30
    def setUp(self):
29
 
        super(TestConflictsBase, self).setUp()
30
 
        self.make_tree_with_conflicts()
31
 
 
32
 
    def make_tree_with_conflicts(self):
 
31
        super(ExternalBase, self).setUp()
33
32
        a_tree = self.make_branch_and_tree('a')
34
33
        self.build_tree_contents([
35
34
            ('a/myfile', 'contentsa\n'),
54
53
        a_tree.rename_one('mydir', 'mydir3')
55
54
        a_tree.commit(message='change')
56
55
        a_tree.merge_from_branch(b_tree.branch)
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):
 
56
        os.chdir('a')
64
57
 
65
58
    def test_conflicts(self):
66
 
        out, err = self.run_bzr('conflicts')
67
 
        self.assertEqual(3, len(out.splitlines()))
 
59
        conflicts, errs = self.run_bzr('conflicts')
 
60
        self.assertEqual(3, len(conflicts.splitlines()))
68
61
 
69
62
    def test_conflicts_text(self):
70
 
        out, err = self.run_bzr('conflicts --text')
71
 
        self.assertEqual(['my_other_file', 'myfile'], out.splitlines())
72
 
 
73
 
    def test_conflicts_directory(self):
74
 
        """Test --directory option"""
75
 
        out, err = self.run_bzr('conflicts --directory a', working_dir='.')
76
 
        self.assertEqual(3, len(out.splitlines()))
77
 
        self.assertEqual('', err)
78
 
 
79
 
 
80
 
class TestResolve(TestConflictsBase):
 
63
        conflicts = self.run_bzr('conflicts --text')[0].splitlines()
 
64
        self.assertEqual(['my_other_file', 'myfile'], conflicts)
81
65
 
82
66
    def test_resolve(self):
83
67
        self.run_bzr('resolve myfile')
84
 
        out, err = self.run_bzr('conflicts')
85
 
        self.assertEqual(2, len(out.splitlines()))
 
68
        conflicts, errs = self.run_bzr('conflicts')
 
69
        self.assertEqual(2, len(conflicts.splitlines()))
86
70
        self.run_bzr('resolve my_other_file')
87
71
        self.run_bzr('resolve mydir2')
88
 
        out, err = self.run_bzr('conflicts')
89
 
        self.assertEqual(0, len(out.splitlines()))
 
72
        conflicts, errs = self.run_bzr('conflicts')
 
73
        self.assertEqual(len(conflicts.splitlines()), 0)
90
74
 
91
75
    def test_resolve_all(self):
92
76
        self.run_bzr('resolve --all')
93
 
        out, err = self.run_bzr('conflicts')
94
 
        self.assertEqual(0, len(out.splitlines()))
 
77
        conflicts, errs = self.run_bzr('conflicts')
 
78
        self.assertEqual(len(conflicts.splitlines()), 0)
95
79
 
96
80
    def test_resolve_in_subdir(self):
97
81
        """resolve when run from subdirectory should handle relative paths"""
98
 
        self.build_tree(["a/subdir/"])
99
 
        self.run_bzr("resolve ../myfile", working_dir='a/subdir')
100
 
        self.run_bzr("resolve ../a/myfile", working_dir='b')
101
 
        wt = workingtree.WorkingTree.open_containing('b')[0]
102
 
        conflicts = wt.conflicts()
103
 
        self.assertEqual(True, conflicts.is_empty(),
104
 
                         "tree still contains conflicts: %r" % conflicts)
 
82
        orig_dir = os.getcwdu()
 
83
        try:
 
84
            os.mkdir("subdir")
 
85
            os.chdir("subdir")
 
86
            self.run_bzr("resolve ../myfile")
 
87
            os.chdir("../../b")
 
88
            self.run_bzr("resolve ../a/myfile")
 
89
            wt = WorkingTree.open_containing('.')[0]
 
90
            conflicts = wt.conflicts()
 
91
            if not conflicts.is_empty():
 
92
                self.fail("tree still contains conflicts: %r" % conflicts)
 
93
        finally:
 
94
            os.chdir(orig_dir)
105
95
 
106
96
    def test_auto_resolve(self):
107
97
        """Text conflicts can be resolved automatically"""
112
102
        self.assertEqual(tree.kind('file_id'), 'file')
113
103
        file_conflict = conflicts.TextConflict('file', file_id='file_id')
114
104
        tree.set_conflicts(conflicts.ConflictList([file_conflict]))
115
 
        note = self.run_bzr('resolve', retcode=1, working_dir='tree')[1]
 
105
        os.chdir('tree')
 
106
        note = self.run_bzr('resolve', retcode=1)[1]
116
107
        self.assertContainsRe(note, '0 conflict\\(s\\) auto-resolved.')
117
108
        self.assertContainsRe(note,
118
109
            'Remaining conflicts:\nText conflict in file')
119
 
        self.build_tree_contents([('tree/file', 'a\n')])
120
 
        note = self.run_bzr('resolve', working_dir='tree')[1]
 
110
        self.build_tree_contents([('file', 'a\n')])
 
111
        note = self.run_bzr('resolve')[1]
121
112
        self.assertContainsRe(note, 'All conflicts resolved.')
122
 
 
123
 
    def test_resolve_all_directory(self):
124
 
        """Test --directory option"""
125
 
        out, err = self.run_bzr('resolve --all -d a', working_dir='.')
126
 
        self.assertEqual('', err)
127
 
        out, err = self.run_bzr('conflicts')
128
 
        self.assertEqual(0, len(out.splitlines()))