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

  • Committer: Breezy landing bot
  • Author(s): Martin
  • Date: 2017-05-26 09:35:13 UTC
  • mfrom: (6634.2.2 next_up_next)
  • Revision ID: breezy.the.bot@gmail.com-20170526093513-funr1gww70uc4mag
Make iterator objects and use of next Python 3 compatible

Merged from https://code.launchpad.net/~gz/brz/next_up_next/+merge/324586

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_fetch.py
368
368
        # Ensure that we stored a delta
369
369
        source.lock_read()
370
370
        self.addCleanup(source.unlock)
371
 
        record = source.revisions.get_record_stream([('rev-two',)],
372
 
            'unordered', False).next()
 
371
        record = next(source.revisions.get_record_stream([('rev-two',)],
 
372
            'unordered', False))
373
373
        self.assertEqual('knit-delta-gz', record.storage_kind)
374
374
        target.fetch(tree.branch.repository, revision_id='rev-two')
375
375
        # The record should get expanded back to a fulltext
376
376
        target.lock_read()
377
377
        self.addCleanup(target.unlock)
378
 
        record = target.revisions.get_record_stream([('rev-two',)],
379
 
            'unordered', False).next()
 
378
        record = next(target.revisions.get_record_stream([('rev-two',)],
 
379
            'unordered', False))
380
380
        self.assertEqual('knit-ft-gz', record.storage_kind)
381
381
 
382
382
    def test_fetch_with_fallback_and_merge(self):