← 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: Canonical.com Patch Queue Manager
  • Date: 2006-04-09 16:49:22 UTC
  • mfrom: (1534.10.27 bzr.ttransform)
  • Revision ID: pqm@pqm.ubuntu.com-20060409164922-071803e906c8b96d
New conflict-handling system

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.tests import TestCaseWithTransport
 
20
from bzrlib.tests import TestCaseWithTransport, TestCase
21
21
from bzrlib.branch import Branch
22
 
from bzrlib.conflicts import restore
 
22
from bzrlib.conflicts import *
23
23
from bzrlib.errors import NotConflicted
24
24
 
 
25
 
25
26
# TODO: Test commit with some added, and added-but-missing files
26
27
# RBC 20060124 is that not tested in test_commit.py ?
27
28
 
 
29
example_conflicts = ConflictList([ 
 
30
    ContentsConflict('patha', 'ida'), 
 
31
    TextConflict('patha'),
 
32
    PathConflict('pathb', 'pathc', 'idb'),
 
33
    DuplicateID('Unversioned existing file', 'pathc', 'pathc2', 'idc', 'idc'),
 
34
    DuplicateEntry('Moved existing file to',  'pathdd.moved', 'pathd', 'idd', 
 
35
                   None),
 
36
    ParentLoop('Cancelled move', 'pathe', 'path2e', None, 'id2e'),
 
37
    UnversionedParent('Versioned directory', 'pathf', 'idf'),
 
38
    MissingParent('Not deleting', 'pathg', 'idg'),
 
39
])
 
40
 
 
41
 
28
42
class TestConflicts(TestCaseWithTransport):
29
43
 
30
44
    def test_conflicts(self):
38
52
        file('hello.sploo.BASE', 'w').write('yellow world')
39
53
        file('hello.sploo.OTHER', 'w').write('yellow world2')
40
54
        self.assertEqual(len(list(tree.list_files())), 6)
41
 
        conflicts = list(tree.iter_conflicts())
 
55
        conflicts = tree.conflicts()
42
56
        self.assertEqual(len(conflicts), 2)
43
 
        self.assert_('hello' in conflicts)
44
 
        self.assert_('hello.sploo' in conflicts)
 
57
        self.assert_('hello' in conflicts[0].path)
 
58
        self.assert_('hello.sploo' in conflicts[1].path)
45
59
        restore('hello')
46
60
        restore('hello.sploo')
47
 
        self.assertEqual(len(list(tree.iter_conflicts())), 0)
 
61
        self.assertEqual(len(tree.conflicts()), 0)
48
62
        self.assertFileEqual('hello world2', 'hello')
49
63
        assert not os.path.lexists('hello.sploo')
50
64
        self.assertRaises(NotConflicted, restore, 'hello')
51
65
        self.assertRaises(NotConflicted, restore, 'hello.sploo')
 
66
 
 
67
 
 
68
class TestConflictStanzas(TestCase):
 
69
    def test_stanza_roundtrip(self):
 
70
        stanza_iter = example_conflicts.to_stanzas()
 
71
        processed = ConflictList.from_stanzas(stanza_iter)
 
72
        for o,p in zip(processed, example_conflicts):
 
73
            self.assertEqual(o, p)
 
74
 
 
75
    def test_stanzification(self):
 
76
        for stanza in example_conflicts.to_stanzas():
 
77
            try:
 
78
                self.assertStartsWith(stanza['file_id'], 'id')
 
79
            except KeyError:
 
80
                pass
 
81
            self.assertStartsWith(stanza['path'], 'path')
 
82
            try:
 
83
                self.assertStartsWith(stanza['conflict_file_id'], 'id')
 
84
                self.assertStartsWith(stanza['conflict_file_path'], 'path')
 
85
            except KeyError:
 
86
                pass