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

  • Committer: Jelmer Vernooij
  • Date: 2020-08-10 15:00:17 UTC
  • mfrom: (7490.40.99 work)
  • mto: This revision was merged to the branch mainline in revision 7521.
  • Revision ID: jelmer@jelmer.uk-20200810150017-vs7xnrd1vat4iktg
Merge lp:brz/3.1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_workingtree/test_workingtree.py
56
56
    TreeFile,
57
57
    TreeLink,
58
58
    )
59
 
from ...conflicts import ConflictList, TextConflict, ContentsConflict
 
59
from ...bzr.conflicts import ConflictList, TextConflict, ContentsConflict
60
60
from ...workingtree import (
61
61
    SettingFileIdUnsupported,
62
62
    WorkingTree,
797
797
        tree = self.make_merge_conflicts()
798
798
        self.assertEqual(len(tree.conflicts()), 1)
799
799
        try:
800
 
            tree.set_conflicts(ConflictList())
 
800
            tree.set_conflicts([])
801
801
        except UnsupportedOperation:
802
802
            raise TestSkipped('unsupported operation')
803
803
        self.assertEqual(tree.conflicts(), ConflictList())
929
929
            present_stat = os.lstat('present')
930
930
            unknown_stat = os.lstat('unknown')
931
931
            expected_results = [
932
 
                (('', tree.path2id('')),
933
 
                 [('missing', 'missing', 'unknown', None, b'missing-id', 'file'),
 
932
                ('',
 
933
                 [('missing', 'missing', 'unknown', None, 'file'),
934
934
                  ('present', 'present', 'file',
935
 
                   present_stat, b'present-id', 'file'),
936
 
                  ('unknown', 'unknown', 'file', unknown_stat, None, None),
 
935
                   present_stat, 'file'),
 
936
                  ('unknown', 'unknown', 'file', unknown_stat, None),
937
937
                  ]
938
938
                 )]
939
939
            self.assertEqual(expected_results, list(tree.walkdirs()))