← 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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-02-10 16:25:28 UTC
  • mfrom: (5020.1.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20100210162528-00g29u0ex6vzv914
(gerard) Update performs two merges in a more logical order but stop
        on conflicts

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, 2010 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
 
    conflicts
 
18
    conflicts,
 
19
    tests,
 
20
    workingtree,
21
21
    )
22
 
from bzrlib.workingtree import WorkingTree
23
 
from bzrlib.tests.blackbox import ExternalBase
24
22
 
25
23
# FIXME: These don't really look at the output of the conflict commands, just
26
24
# the number of lines - there should be more examination.
27
25
 
28
 
class TestConflicts(ExternalBase):
 
26
class TestConflictsBase(tests.TestCaseWithTransport):
29
27
 
30
28
    def setUp(self):
31
 
        super(ExternalBase, self).setUp()
 
29
        super(TestConflictsBase, self).setUp()
 
30
        self.make_tree_with_conflicts()
 
31
 
 
32
    def make_tree_with_conflicts(self):
32
33
        a_tree = self.make_branch_and_tree('a')
33
34
        self.build_tree_contents([
34
35
            ('a/myfile', 'contentsa\n'),
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
    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):
57
64
 
58
65
    def test_conflicts(self):
59
 
        conflicts, errs = self.run_bzr('conflicts')
60
 
        self.assertEqual(3, len(conflicts.splitlines()))
 
66
        out, err = self.run_bzr('conflicts')
 
67
        self.assertEqual(3, len(out.splitlines()))
61
68
 
62
69
    def test_conflicts_text(self):
63
 
        conflicts = self.run_bzr('conflicts --text')[0].splitlines()
64
 
        self.assertEqual(['my_other_file', 'myfile'], conflicts)
 
70
        out, err = self.run_bzr('conflicts --text')
 
71
        self.assertEqual(['my_other_file', 'myfile'], out.splitlines())
 
72
 
 
73
 
 
74
class TestResolve(TestConflictsBase):
65
75
 
66
76
    def test_resolve(self):
67
77
        self.run_bzr('resolve myfile')
68
 
        conflicts, errs = self.run_bzr('conflicts')
69
 
        self.assertEqual(2, len(conflicts.splitlines()))
 
78
        out, err = self.run_bzr('conflicts')
 
79
        self.assertEqual(2, len(out.splitlines()))
70
80
        self.run_bzr('resolve my_other_file')
71
81
        self.run_bzr('resolve mydir2')
72
 
        conflicts, errs = self.run_bzr('conflicts')
73
 
        self.assertEqual(len(conflicts.splitlines()), 0)
 
82
        out, err = self.run_bzr('conflicts')
 
83
        self.assertEqual(0, len(out.splitlines()))
74
84
 
75
85
    def test_resolve_all(self):
76
86
        self.run_bzr('resolve --all')
77
 
        conflicts, errs = self.run_bzr('conflicts')
78
 
        self.assertEqual(len(conflicts.splitlines()), 0)
 
87
        out, err = self.run_bzr('conflicts')
 
88
        self.assertEqual(0, len(out.splitlines()))
79
89
 
80
90
    def test_resolve_in_subdir(self):
81
91
        """resolve when run from subdirectory should handle relative paths"""
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)
 
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]
 
96
        conflicts = wt.conflicts()
 
97
        self.assertEqual(True, conflicts.is_empty(),
 
98
                         "tree still contains conflicts: %r" % conflicts)
95
99
 
96
100
    def test_auto_resolve(self):
97
101
        """Text conflicts can be resolved automatically"""
102
106
        self.assertEqual(tree.kind('file_id'), 'file')
103
107
        file_conflict = conflicts.TextConflict('file', file_id='file_id')
104
108
        tree.set_conflicts(conflicts.ConflictList([file_conflict]))
105
 
        os.chdir('tree')
106
 
        note = self.run_bzr('resolve', retcode=1)[1]
 
109
        note = self.run_bzr('resolve', retcode=1, working_dir='tree')[1]
107
110
        self.assertContainsRe(note, '0 conflict\\(s\\) auto-resolved.')
108
111
        self.assertContainsRe(note,
109
112
            'Remaining conflicts:\nText conflict in file')
110
 
        self.build_tree_contents([('file', 'a\n')])
111
 
        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]
112
115
        self.assertContainsRe(note, 'All conflicts resolved.')