/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_conflicts.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-08-07 21:24:40 UTC
  • mfrom: (7058.4.30 python3-x)
  • Revision ID: breezy.the.bot@gmail.com-20180807212440-m7r0c45ihwr0kcre
Fix another round of tests on Python 3.

Merged from https://code.launchpad.net/~jelmer/brz/python3-x/+merge/352226

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_conflicts.py
43
43
# '\xc3\xae' == u'\xee' == i with hat
44
44
# So these are u'path' and 'id' only with a circle and a hat. (shappo?)
45
45
example_conflicts = conflicts.ConflictList(
46
 
    [conflicts.MissingParent('Not deleting', u'p\xe5thg', '\xc3\xaedg'),
47
 
     conflicts.ContentsConflict(u'p\xe5tha', None, '\xc3\xaeda'),
 
46
    [conflicts.MissingParent('Not deleting', u'p\xe5thg', b'\xc3\xaedg'),
 
47
     conflicts.ContentsConflict(u'p\xe5tha', None, b'\xc3\xaeda'),
48
48
     conflicts.TextConflict(u'p\xe5tha'),
49
 
     conflicts.PathConflict(u'p\xe5thb', u'p\xe5thc', '\xc3\xaedb'),
 
49
     conflicts.PathConflict(u'p\xe5thb', u'p\xe5thc', b'\xc3\xaedb'),
50
50
     conflicts.DuplicateID('Unversioned existing file',
51
51
                           u'p\xe5thc', u'p\xe5thc2',
52
 
                           '\xc3\xaedc', '\xc3\xaedc'),
 
52
                           b'\xc3\xaedc', b'\xc3\xaedc'),
53
53
    conflicts.DuplicateEntry('Moved existing file to',
54
54
                             u'p\xe5thdd.moved', u'p\xe5thd',
55
 
                             '\xc3\xaedd', None),
 
55
                             b'\xc3\xaedd', None),
56
56
    conflicts.ParentLoop('Cancelled move', u'p\xe5the', u'p\xe5th2e',
57
 
                         None, '\xc3\xaed2e'),
 
57
                         None, b'\xc3\xaed2e'),
58
58
    conflicts.UnversionedParent('Versioned directory',
59
 
                                u'p\xe5thf', '\xc3\xaedf'),
 
59
                                u'p\xe5thf', b'\xc3\xaedf'),
60
60
    conflicts.NonDirectoryParent('Created directory',
61
 
                                 u'p\xe5thg', '\xc3\xaedg'),
 
61
                                 u'p\xe5thg', b'\xc3\xaedg'),
62
62
])
63
63
 
64
64
 
933
933
            (dict(_base_actions='create_dir1_dir2'),
934
934
             ('dir1_into_dir2',
935
935
              dict(actions='move_dir1_into_dir2', check='dir1_moved',
936
 
                   dir_id=b'dir1-id', target_id='dir2-id', xfail=False)),
 
936
                   dir_id=b'dir1-id', target_id=b'dir2-id', xfail=False)),
937
937
             ('dir2_into_dir1',
938
938
              dict(actions='move_dir2_into_dir1', check='dir2_moved',
939
 
                   dir_id=b'dir2-id', target_id='dir1-id', xfail=False))),
 
939
                   dir_id=b'dir2-id', target_id=b'dir1-id', xfail=False))),
940
940
            # Subdirs moved into each other
941
941
            (dict(_base_actions='create_dir1_4'),
942
942
             ('dir1_into_dir4',
943
943
              dict(actions='move_dir1_into_dir4', check='dir1_2_moved',
944
 
                   dir_id=b'dir1-id', target_id='dir4-id', xfail=True)),
 
944
                   dir_id=b'dir1-id', target_id=b'dir4-id', xfail=True)),
945
945
             ('dir3_into_dir2',
946
946
              dict(actions='move_dir3_into_dir2', check='dir3_4_moved',
947
 
                   dir_id=b'dir3-id', target_id='dir2-id', xfail=True))),
 
947
                   dir_id=b'dir3-id', target_id=b'dir2-id', xfail=True))),
948
948
            ])
949
949
 
950
950
    def do_create_dir1_dir2(self):