← 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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-08-28 15:52:02 UTC
  • mfrom: (2761.1.3 tree-conflicts)
  • Revision ID: pqm@pqm.ubuntu.com-20070828155202-pcq659o80mx4f4p3
Fix status -r path / Tree.conflicts (Lukas Lalinsky)

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
142
143
        self.assertRaises(errors.NoSuchId, lambda: list(
143
144
                          tree.iter_files_bytes(
144
145
                          [('qux-id', 'file1-notpresent')])))
 
146
 
 
147
 
 
148
class TestConflicts(TestCaseWithTree):
 
149
 
 
150
    def test_conflicts(self):
 
151
        """Tree.conflicts() should return a ConflictList instance."""
 
152
        work_tree = self.make_branch_and_tree('wt')
 
153
        tree = self._convert_tree(work_tree)
 
154
        self.assertIsInstance(tree.conflicts(), conflicts.ConflictList)