← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/tree_implementations/test_tree.py

Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/tree_implementations/test_tree.py
17
17
from bzrlib import (
18
18
    errors,
19
19
    tests,
 
20
    conflicts,
20
21
    )
21
22
from bzrlib.tests import TestSkipped
22
23
from bzrlib.tests.tree_implementations import TestCaseWithTree
159
160
        self.assertRaises(errors.NoSuchId, lambda: list(
160
161
                          tree.iter_files_bytes(
161
162
                          [('qux-id', 'file1-notpresent')])))
 
163
 
 
164
 
 
165
class TestConflicts(TestCaseWithTree):
 
166
 
 
167
    def test_conflicts(self):
 
168
        """Tree.conflicts() should return a ConflictList instance."""
 
169
        work_tree = self.make_branch_and_tree('wt')
 
170
        tree = self._convert_tree(work_tree)
 
171
        self.assertIsInstance(tree.conflicts(), conflicts.ConflictList)