/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_interrepository/test_fetch.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-06-30 23:11:39 UTC
  • mfrom: (6973.12.13 python3-k)
  • Revision ID: breezy.the.bot@gmail.com-20180630231139-tf5t5khh6bu5ntpm
Fix some more tests on python3.

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

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_interrepository/test_fetch.py
115
115
            # We need two revisions: OLD and NEW. NEW will claim to need a file
116
116
            # 'FOO' changed in 'OLD'. OLD will not have that file at all.
117
117
            source.texts.insert_record_stream([
118
 
                versionedfile.FulltextContentFactory(('foo', revid), (), None,
119
 
                'contents')])
 
118
                versionedfile.FulltextContentFactory((b'foo', revid), (), None,
 
119
                b'contents')])
120
120
            basis = source.revision_tree(revid)
121
121
            parent_id = basis.path2id('')
122
 
            entry = inventory.make_entry('file', 'foo-path', parent_id, 'foo')
 
122
            entry = inventory.make_entry('file', 'foo-path', parent_id, b'foo')
123
123
            entry.revision = revid
124
124
            entry.text_size = len('contents')
125
125
            entry.text_sha1 = osutils.sha_string('contents')
126
126
            inv_sha1, _ = source.add_inventory_by_delta(revid, [
127
 
                (None, 'foo-path', 'foo', entry)], 'new', [revid])
 
127
                (None, 'foo-path', b'foo', entry)], b'new', [revid])
128
128
            rev = Revision(timestamp=0,
129
129
                           timezone=None,
130
130
                           committer="Foo Bar <foo@example.com>",
138
138
            raise
139
139
        else:
140
140
            source.commit_write_group()
141
 
        to_repo.fetch(source, 'new')
 
141
        to_repo.fetch(source, b'new')
142
142
        to_repo.lock_read()
143
143
        self.addCleanup(to_repo.unlock)
144
 
        self.assertEqual('contents',
145
 
            to_repo.texts.get_record_stream([('foo', revid)],
 
144
        self.assertEqual(b'contents',
 
145
            to_repo.texts.get_record_stream([(b'foo', revid)],
146
146
            'unordered', True).next().get_bytes_as('fulltext'))
147
147
 
148
148
    def test_fetch_from_stacked_smart(self):