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

  • Committer: Robert Collins
  • Date: 2006-03-03 02:09:49 UTC
  • mto: (1594.2.4 integration)
  • mto: This revision was merged to the branch mainline in revision 1596.
  • Revision ID: robertc@robertcollins.net-20060303020949-0ddc6f33d0a43943
Smoke test for RevisionStore factories creating revision stores.

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, TestCase
 
20
from bzrlib.tests import TestCaseWithTransport
21
21
from bzrlib.branch import Branch
22
 
from bzrlib.conflicts import *
 
22
from bzrlib.conflicts import restore
23
23
from bzrlib.errors import NotConflicted
24
24
 
25
 
 
26
25
# TODO: Test commit with some added, and added-but-missing files
27
26
# RBC 20060124 is that not tested in test_commit.py ?
28
27
 
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
 
 
42
28
class TestConflicts(TestCaseWithTransport):
43
29
 
44
30
    def test_conflicts(self):
52
38
        file('hello.sploo.BASE', 'w').write('yellow world')
53
39
        file('hello.sploo.OTHER', 'w').write('yellow world2')
54
40
        self.assertEqual(len(list(tree.list_files())), 6)
55
 
        conflicts = tree.conflicts()
 
41
        conflicts = list(tree.iter_conflicts())
56
42
        self.assertEqual(len(conflicts), 2)
57
 
        self.assert_('hello' in conflicts[0].path)
58
 
        self.assert_('hello.sploo' in conflicts[1].path)
 
43
        self.assert_('hello' in conflicts)
 
44
        self.assert_('hello.sploo' in conflicts)
59
45
        restore('hello')
60
46
        restore('hello.sploo')
61
 
        self.assertEqual(len(tree.conflicts()), 0)
 
47
        self.assertEqual(len(list(tree.iter_conflicts())), 0)
62
48
        self.assertFileEqual('hello world2', 'hello')
63
49
        assert not os.path.lexists('hello.sploo')
64
50
        self.assertRaises(NotConflicted, restore, 'hello')
65
51
        self.assertRaises(NotConflicted, restore, 'hello.sploo')
66
 
 
67
 
    def test_resolve_conflict_dir(self):
68
 
        tree = self.make_branch_and_tree('.')
69
 
        b = tree.branch
70
 
        file('hello', 'w').write('hello world4')
71
 
        tree.add('hello', 'q')
72
 
        file('hello.THIS', 'w').write('hello world2')
73
 
        file('hello.BASE', 'w').write('hello world1')
74
 
        os.mkdir('hello.OTHER')
75
 
        l = ConflictList([TextConflict('hello')])
76
 
        l.remove_files(tree)
77
 
 
78
 
 
79
 
class TestConflictStanzas(TestCase):
80
 
    def test_stanza_roundtrip(self):
81
 
        stanza_iter = example_conflicts.to_stanzas()
82
 
        processed = ConflictList.from_stanzas(stanza_iter)
83
 
        for o,p in zip(processed, example_conflicts):
84
 
            self.assertEqual(o, p)
85
 
 
86
 
    def test_stanzification(self):
87
 
        for stanza in example_conflicts.to_stanzas():
88
 
            try:
89
 
                self.assertStartsWith(stanza['file_id'], 'id')
90
 
            except KeyError:
91
 
                pass
92
 
            self.assertStartsWith(stanza['path'], 'path')
93
 
            try:
94
 
                self.assertStartsWith(stanza['conflict_file_id'], 'id')
95
 
                self.assertStartsWith(stanza['conflict_file_path'], 'path')
96
 
            except KeyError:
97
 
                pass