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

  • Committer: Jelmer Vernooij
  • Date: 2019-06-16 16:46:13 UTC
  • mto: (7290.1.28 work)
  • mto: This revision was merged to the branch mainline in revision 7351.
  • Revision ID: jelmer@jelmer.uk-20190616164613-hgnuxciacvv0ugqn
Some more tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_workingtree.py
456
456
        tree.add('hello', b'hello-id')
457
457
        file_conflict = conflicts.TextConflict('hello', b'hello-id')
458
458
        tree.set_conflicts(conflicts.ConflictList([file_conflict]))
459
 
        self._auto_resolve(tree)
 
459
        remaining, resolved = self._auto_resolve(tree)
 
460
        self.assertEqual(
 
461
            remaining,
 
462
            conflicts.ConflictList([conflicts.TextConflict(u'hello', 'hello-id')]))
 
463
        self.assertEqual(resolved, [])
 
464
 
 
465
    def test_auto_resolve_missing(self):
 
466
        tree = self.make_branch_and_tree('tree')
 
467
        file_conflict = conflicts.TextConflict('hello', b'hello-id')
 
468
        tree.set_conflicts(conflicts.ConflictList([file_conflict]))
 
469
        remaining, resolved = self._auto_resolve(tree)
 
470
        self.assertEqual(remaining, [])
 
471
        self.assertEqual(
 
472
            resolved,
 
473
            conflicts.ConflictList([conflicts.TextConflict(u'hello', 'hello-id')]))
460
474
 
461
475
 
462
476
class TestFindTrees(TestCaseWithTransport):