/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/workingtree_implementations/test_workingtree.py

  • Committer: Alexander Belchenko
  • Date: 2007-11-04 11:45:30 UTC
  • mfrom: (2961 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2968.
  • Revision ID: bialix@ukr.net-20071104114530-30jl2zjawaxe375f
merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/workingtree_implementations/test_workingtree.py
642
642
        try:
643
643
            tree.set_conflicts(ConflictList())
644
644
        except UnsupportedOperation:
645
 
            raise TestSkipped
 
645
            raise TestSkipped('unsupported operation')
646
646
        self.assertEqual(tree.conflicts(), ConflictList())
647
647
 
648
648
    def test_add_conflicts(self):
650
650
        try:
651
651
            tree.add_conflicts([TextConflict('path_a')])
652
652
        except UnsupportedOperation:
653
 
            raise TestSkipped()
 
653
            raise TestSkipped('unsupported operation')
654
654
        self.assertEqual(ConflictList([TextConflict('path_a')]),
655
655
                         tree.conflicts())
656
656
        tree.add_conflicts([TextConflict('path_a')])