← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_conflicts.py

  • Committer: Martin Pool
  • Date: 2006-02-22 04:29:54 UTC
  • mfrom: (1566 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1569.
  • Revision ID: mbp@sourcefrog.net-20060222042954-60333f08dd56a646
[merge] from bzr.dev before integration
Fix undefined ordering in sign_my_revisions breaking tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_conflicts.py
17
17
 
18
18
import os
19
19
 
20
 
from bzrlib import bzrdir
21
 
from bzrlib.tests import TestCaseWithTransport, TestCase
 
20
from bzrlib.tests import TestCaseWithTransport
22
21
from bzrlib.branch import Branch
23
 
from bzrlib.conflicts import (MissingParent, ContentsConflict, TextConflict,
24
 
        PathConflict, DuplicateID, DuplicateEntry, ParentLoop, UnversionedParent,
25
 
        ConflictList, 
26
 
        restore)
 
22
from bzrlib.conflicts import restore
27
23
from bzrlib.errors import NotConflicted
28
24
 
29
 
 
30
25
# TODO: Test commit with some added, and added-but-missing files
31
26
# RBC 20060124 is that not tested in test_commit.py ?
32
27
 
33
 
# The order of 'path' here is important - do not let it
34
 
# be a sorted list.
35
 
example_conflicts = ConflictList([ 
36
 
    MissingParent('Not deleting', 'pathg', 'idg'),
37
 
    ContentsConflict('patha', 'ida'), 
38
 
    TextConflict('patha'),
39
 
    PathConflict('pathb', 'pathc', 'idb'),
40
 
    DuplicateID('Unversioned existing file', 'pathc', 'pathc2', 'idc', 'idc'),
41
 
    DuplicateEntry('Moved existing file to',  'pathdd.moved', 'pathd', 'idd', 
42
 
                   None),
43
 
    ParentLoop('Cancelled move', 'pathe', 'path2e', None, 'id2e'),
44
 
    UnversionedParent('Versioned directory', 'pathf', 'idf'),
45
 
])
46
 
 
47
 
 
48
28
class TestConflicts(TestCaseWithTransport):
49
29
 
50
30
    def test_conflicts(self):
51
31
        """Conflicts are detected properly"""
52
 
        tree = self.make_branch_and_tree('.',
53
 
            format=bzrdir.BzrDirFormat6())
 
32
        tree = self.make_branch_and_tree('.')
54
33
        b = tree.branch
55
34
        file('hello', 'w').write('hello world4')
56
35
        file('hello.THIS', 'w').write('hello world2')
59
38
        file('hello.sploo.BASE', 'w').write('yellow world')
60
39
        file('hello.sploo.OTHER', 'w').write('yellow world2')
61
40
        self.assertEqual(len(list(tree.list_files())), 6)
62
 
        conflicts = tree.conflicts()
 
41
        conflicts = list(tree.iter_conflicts())
63
42
        self.assertEqual(len(conflicts), 2)
64
 
        self.assert_('hello' in conflicts[0].path)
65
 
        self.assert_('hello.sploo' in conflicts[1].path)
 
43
        self.assert_('hello' in conflicts)
 
44
        self.assert_('hello.sploo' in conflicts)
66
45
        restore('hello')
67
46
        restore('hello.sploo')
68
 
        self.assertEqual(len(tree.conflicts()), 0)
 
47
        self.assertEqual(len(list(tree.iter_conflicts())), 0)
69
48
        self.assertFileEqual('hello world2', 'hello')
70
49
        assert not os.path.lexists('hello.sploo')
71
50
        self.assertRaises(NotConflicted, restore, 'hello')
72
51
        self.assertRaises(NotConflicted, restore, 'hello.sploo')
73
 
 
74
 
    def test_resolve_conflict_dir(self):
75
 
        tree = self.make_branch_and_tree('.')
76
 
        b = tree.branch
77
 
        file('hello', 'w').write('hello world4')
78
 
        tree.add('hello', 'q')
79
 
        file('hello.THIS', 'w').write('hello world2')
80
 
        file('hello.BASE', 'w').write('hello world1')
81
 
        os.mkdir('hello.OTHER')
82
 
        l = ConflictList([TextConflict('hello')])
83
 
        l.remove_files(tree)
84
 
 
85
 
 
86
 
class TestConflictStanzas(TestCase):
87
 
 
88
 
    def test_stanza_roundtrip(self):
89
 
        # write and read our example stanza.
90
 
        stanza_iter = example_conflicts.to_stanzas()
91
 
        processed = ConflictList.from_stanzas(stanza_iter)
92
 
        for o,p in zip(processed, example_conflicts):
93
 
            self.assertEqual(o, p)
94
 
 
95
 
    def test_stanzification(self):
96
 
        for stanza in example_conflicts.to_stanzas():
97
 
            try:
98
 
                self.assertStartsWith(stanza['file_id'], 'id')
99
 
            except KeyError:
100
 
                pass
101
 
            self.assertStartsWith(stanza['path'], 'path')
102
 
            try:
103
 
                self.assertStartsWith(stanza['conflict_file_id'], 'id')
104
 
                self.assertStartsWith(stanza['conflict_file_path'], 'path')
105
 
            except KeyError:
106
 
                pass