/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: Martin Pool
  • Date: 2007-10-03 08:06:44 UTC
  • mto: This revision was merged to the branch mainline in revision 2901.
  • Revision ID: mbp@sourcefrog.net-20071003080644-oivy0gkg98sex0ed
Avoid internal error tracebacks on failure to lock on readonly transport (#129701).

Add new LockFailed, which doesn't imply that we failed to get it because of
contention.  Raise this if we fail to create the pending or lock directories
because of Transport errors.

UnlockableTransport is not an internal error.

ReadOnlyLockError has a message which didn't match its name or usage; it's now
deprecated and callers are updated to use LockFailed which is more appropriate.

Add zero_ninetytwo deprecation symbol.

Unify assertMatchesRe with TestCase.assertContainsRe.

When the constructor is deprecated, just say that the class is deprecated, not
the __init__ method - this works better with applyDeprecated in tests.

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):
 
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
 
 
74
 
class TestResolve(TestConflictsBase):
 
63
        conflicts = self.run_bzr('conflicts --text')[0].splitlines()
 
64
        self.assertEqual(['my_other_file', 'myfile'], conflicts)
75
65
 
76
66
    def test_resolve(self):
77
67
        self.run_bzr('resolve myfile')
78
 
        out, err = self.run_bzr('conflicts')
79
 
        self.assertEqual(2, len(out.splitlines()))
 
68
        conflicts, errs = self.run_bzr('conflicts')
 
69
        self.assertEqual(2, len(conflicts.splitlines()))
80
70
        self.run_bzr('resolve my_other_file')
81
71
        self.run_bzr('resolve mydir2')
82
 
        out, err = self.run_bzr('conflicts')
83
 
        self.assertEqual(0, len(out.splitlines()))
 
72
        conflicts, errs = self.run_bzr('conflicts')
 
73
        self.assertEqual(len(conflicts.splitlines()), 0)
84
74
 
85
75
    def test_resolve_all(self):
86
76
        self.run_bzr('resolve --all')
87
 
        out, err = self.run_bzr('conflicts')
88
 
        self.assertEqual(0, len(out.splitlines()))
 
77
        conflicts, errs = self.run_bzr('conflicts')
 
78
        self.assertEqual(len(conflicts.splitlines()), 0)
89
79
 
90
80
    def test_resolve_in_subdir(self):
91
81
        """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)
 
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)
99
95
 
100
96
    def test_auto_resolve(self):
101
97
        """Text conflicts can be resolved automatically"""
106
102
        self.assertEqual(tree.kind('file_id'), 'file')
107
103
        file_conflict = conflicts.TextConflict('file', file_id='file_id')
108
104
        tree.set_conflicts(conflicts.ConflictList([file_conflict]))
109
 
        note = self.run_bzr('resolve', retcode=1, working_dir='tree')[1]
 
105
        os.chdir('tree')
 
106
        note = self.run_bzr('resolve', retcode=1)[1]
110
107
        self.assertContainsRe(note, '0 conflict\\(s\\) auto-resolved.')
111
108
        self.assertContainsRe(note,
112
109
            '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]
 
110
        self.build_tree_contents([('file', 'a\n')])
 
111
        note = self.run_bzr('resolve')[1]
115
112
        self.assertContainsRe(note, 'All conflicts resolved.')