/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: Jelmer Vernooij
  • Date: 2018-06-21 23:59:28 UTC
  • mfrom: (6973.6.4 python3-e)
  • Revision ID: jelmer@jelmer.uk-20180621235928-f7z0vf0lxc6ieo9e
Merge lp:~jelmer/brz/python3-e

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_interrepository/test_fetch.py
161
161
        builder = self.make_branch_builder('full-branch')
162
162
        builder.start_series()
163
163
        builder.build_snapshot(None, [
164
 
            ('add', ('', 'root-id', 'directory', '')),
165
 
            ('add', ('file', 'file-id', 'file', 'content\n'))],
 
164
            ('add', ('', b'root-id', 'directory', '')),
 
165
            ('add', ('file', b'file-id', 'file', b'content\n'))],
166
166
            revision_id=b'first')
167
 
        builder.build_snapshot(['first'], [
 
167
        builder.build_snapshot([b'first'], [
168
168
            ('modify', ('file', b'second content\n'))],
169
169
            revision_id=b'second')
170
170
        builder.build_snapshot([b'second'], [
174
174
        branch = builder.get_branch()
175
175
        repo = self.make_repository('stacking-base')
176
176
        trunk = repo.controldir.create_branch()
177
 
        trunk.repository.fetch(branch.repository, 'second')
 
177
        trunk.repository.fetch(branch.repository, b'second')
178
178
        repo = self.make_repository('stacked')
179
179
        stacked_branch = repo.controldir.create_branch()
180
180
        stacked_branch.set_stacked_on_url(trunk.base)
181
 
        stacked_branch.repository.fetch(branch.repository, 'third')
 
181
        stacked_branch.repository.fetch(branch.repository, b'third')
182
182
        target = self.make_to_repository('target')
183
183
        try:
184
 
            target.fetch(stacked_branch.repository, 'third')
 
184
            target.fetch(stacked_branch.repository, b'third')
185
185
        except errors.NoRoundtrippingSupport:
186
186
            raise TestNotApplicable('roundtripping not supported')
187
187
        target.lock_read()
188
188
        self.addCleanup(target.unlock)
189
 
        all_revs = {'first', 'second', 'third'}
 
189
        all_revs = {b'first', b'second', b'third'}
190
190
        self.assertEqual(all_revs, set(target.get_parent_map(all_revs)))
191
191
 
192
192
    def test_fetch_parent_inventories_at_stacking_boundary_smart(self):