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

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-07-02 01:50:36 UTC
  • mfrom: (6973.13.15 python3-l)
  • Revision ID: breezy.the.bot@gmail.com-20180702015036-p7h30yemu44e4p01
Fix more tests on Python3.

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

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test__annotator.py
195
195
    def test_annotate_common_merge_text(self):
196
196
        self.make_common_merge_text()
197
197
        # there is no common point, so we just pick the lexicographical lowest
198
 
        # and 'b-id' comes before 'c-id'
 
198
        # and b'b-id' comes before b'c-id'
199
199
        self.assertEqual([(self.fa_key, b'simple\n'),
200
200
                          (self.fb_key, b'new content\n'),
201
201
                         ], self.ann.annotate_flat(self.fd_key))
231
231
        # Calls happen in set iteration order but should keys should be seen
232
232
        self.assertEqual({self.fb_key, self.fc_key, self.fe_key}, seen)
233
233
 
234
 
 
235
234
    def test_needed_keys_simple(self):
236
235
        self.make_simple_text()
237
236
        keys, ann_keys = self.ann._get_needed_keys(self.fb_key)