/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 bzrlib/tests/blackbox/test_conflicts.py

  • Committer: John Arbash Meinel
  • Date: 2007-05-31 20:29:04 UTC
  • mto: This revision was merged to the branch mainline in revision 2499.
  • Revision ID: john@arbash-meinel.com-20070531202904-34h7ygudo7qq9ha1
Update the code so that symlinks aren't cached at incorrect times
and fix the tests so that they don't assume files and symlinks
get cached even when the timestamp doesn't declare them 'safe'.

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
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
16
 
 
17
import os
16
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):
27
 
 
 
28
class TestConflicts(ExternalBase):
28
29
    def setUp(self):
29
 
        super(TestConflictsBase, self).setUp()
30
 
        self.make_tree_with_conflicts()
31
 
 
32
 
    def make_tree_with_conflicts(self):
33
 
        a_tree = self.make_branch_and_tree('a')
34
 
        self.build_tree_contents([
35
 
            ('a/myfile', 'contentsa\n'),
36
 
            ('a/my_other_file', 'contentsa\n'),
37
 
            ('a/mydir/',),
38
 
            ])
39
 
        a_tree.add('myfile')
40
 
        a_tree.add('my_other_file')
41
 
        a_tree.add('mydir')
42
 
        a_tree.commit(message="new")
43
 
        b_tree = a_tree.bzrdir.sprout('b').open_workingtree()
44
 
        self.build_tree_contents([
45
 
            ('b/myfile', 'contentsb\n'),
46
 
            ('b/my_other_file', 'contentsb\n'),
47
 
            ])
48
 
        b_tree.rename_one('mydir', 'mydir2')
49
 
        b_tree.commit(message="change")
50
 
        self.build_tree_contents([
51
 
            ('a/myfile', 'contentsa2\n'),
52
 
            ('a/my_other_file', 'contentsa2\n'),
53
 
            ])
54
 
        a_tree.rename_one('mydir', 'mydir3')
55
 
        a_tree.commit(message='change')
56
 
        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):
 
30
        super(ExternalBase, self).setUp()
 
31
        try:
 
32
            os.mkdir('a')
 
33
        except:
 
34
            raise os.getcwd()
 
35
        os.chdir('a')
 
36
        self.runbzr('init')
 
37
        file('myfile', 'wb').write('contentsa\n')
 
38
        file('my_other_file', 'wb').write('contentsa\n')
 
39
        os.mkdir('mydir')
 
40
        self.runbzr('add')
 
41
        self.runbzr('commit -m new')
 
42
        os.chdir('..')
 
43
        self.runbzr('branch a b')
 
44
        os.chdir('b')
 
45
        file('myfile', 'wb').write('contentsb\n')
 
46
        file('my_other_file', 'wb').write('contentsb\n')
 
47
        self.runbzr('mv mydir mydir2')
 
48
        self.runbzr('commit -m change')
 
49
        os.chdir('../a')
 
50
        file('myfile', 'wb').write('contentsa2\n')
 
51
        file('my_other_file', 'wb').write('contentsa2\n')
 
52
        self.runbzr('mv mydir mydir3')
 
53
        self.runbzr('commit -m change')
 
54
        self.runbzr('merge ../b', retcode=1)
64
55
 
65
56
    def test_conflicts(self):
66
 
        out, err = self.run_bzr('conflicts')
67
 
        self.assertEqual(3, len(out.splitlines()))
 
57
        conflicts = self.runbzr('conflicts', backtick=True)
 
58
        self.assertEqual(3, len(conflicts.splitlines()))
68
59
 
69
60
    def test_conflicts_text(self):
70
 
        out, err = self.run_bzr('conflicts --text')
71
 
        self.assertEqual(['my_other_file', 'myfile'], out.splitlines())
72
 
 
73
 
 
74
 
class TestResolve(TestConflictsBase):
 
61
        conflicts = self.run_bzr('conflicts', '--text')[0].splitlines()
 
62
        self.assertEqual(['my_other_file', 'myfile'], conflicts)
75
63
 
76
64
    def test_resolve(self):
77
 
        self.run_bzr('resolve myfile')
78
 
        out, err = self.run_bzr('conflicts')
79
 
        self.assertEqual(2, len(out.splitlines()))
80
 
        self.run_bzr('resolve my_other_file')
81
 
        self.run_bzr('resolve mydir2')
82
 
        out, err = self.run_bzr('conflicts')
83
 
        self.assertEqual(0, len(out.splitlines()))
 
65
        self.runbzr('resolve myfile')
 
66
        conflicts = self.runbzr('conflicts', backtick=True)
 
67
        self.assertEqual(2, len(conflicts.splitlines()))
 
68
        self.runbzr('resolve my_other_file')
 
69
        self.runbzr('resolve mydir2')
 
70
        conflicts = self.runbzr('conflicts', backtick=True)
 
71
        self.assertEqual(len(conflicts.splitlines()), 0)
84
72
 
85
73
    def test_resolve_all(self):
86
 
        self.run_bzr('resolve --all')
87
 
        out, err = self.run_bzr('conflicts')
88
 
        self.assertEqual(0, len(out.splitlines()))
 
74
        self.runbzr('resolve --all')
 
75
        conflicts = self.runbzr('conflicts', backtick=True)
 
76
        self.assertEqual(len(conflicts.splitlines()), 0)
89
77
 
90
78
    def test_resolve_in_subdir(self):
91
79
        """resolve when run from subdirectory should handle relative paths"""
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)
 
80
        orig_dir = os.getcwdu()
 
81
        try:
 
82
            os.mkdir("subdir")
 
83
            os.chdir("subdir")
 
84
            self.runbzr("resolve ../myfile")
 
85
            os.chdir("../../b")
 
86
            self.runbzr("resolve ../a/myfile")
 
87
            wt = WorkingTree.open_containing('.')[0]
 
88
            conflicts = wt.conflicts()
 
89
            if not conflicts.is_empty():
 
90
                self.fail("tree still contains conflicts: %r" % conflicts)
 
91
        finally:
 
92
            os.chdir(orig_dir)
99
93
 
100
94
    def test_auto_resolve(self):
101
95
        """Text conflicts can be resolved automatically"""
106
100
        self.assertEqual(tree.kind('file_id'), 'file')
107
101
        file_conflict = conflicts.TextConflict('file', file_id='file_id')
108
102
        tree.set_conflicts(conflicts.ConflictList([file_conflict]))
109
 
        note = self.run_bzr('resolve', retcode=1, working_dir='tree')[1]
 
103
        os.chdir('tree')
 
104
        note = self.run_bzr('resolve', retcode=1)[1]
110
105
        self.assertContainsRe(note, '0 conflict\\(s\\) auto-resolved.')
111
106
        self.assertContainsRe(note,
112
107
            'Remaining conflicts:\nText conflict in file')
113
 
        self.build_tree_contents([('tree/file', 'a\n')])
114
 
        note = self.run_bzr('resolve', working_dir='tree')[1]
 
108
        self.build_tree_contents([('file', 'a\n')])
 
109
        note = self.run_bzr('resolve')[1]
115
110
        self.assertContainsRe(note, 'All conflicts resolved.')