/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_bundle.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_bundle.py
56
56
def get_text(vf, key):
57
57
    """Get the fulltext for a given revision id that is present in the vf"""
58
58
    stream = vf.get_record_stream([key], 'unordered', True)
59
 
    record = stream.next()
 
59
    record = next(stream)
60
60
    return record.get_bytes_as('fulltext')
61
61
 
62
62
 
1764
1764
        fileobj.seek(0)
1765
1765
        reader = v4.BundleReader(fileobj, stream_input=True)
1766
1766
        record_iter = reader.iter_records()
1767
 
        record = record_iter.next()
 
1767
        record = next(record_iter)
1768
1768
        self.assertEqual((None, {'foo': 'bar', 'storage_kind': 'header'},
1769
1769
            'info', None, None), record)
1770
 
        record = record_iter.next()
 
1770
        record = next(record_iter)
1771
1771
        self.assertEqual(("Record body", {'storage_kind': 'fulltext',
1772
1772
                          'parents': ['1', '3']}, 'file', 'revid', 'fileid'),
1773
1773
                          record)
1783
1783
        fileobj.seek(0)
1784
1784
        reader = v4.BundleReader(fileobj, stream_input=False)
1785
1785
        record_iter = reader.iter_records()
1786
 
        record = record_iter.next()
 
1786
        record = next(record_iter)
1787
1787
        self.assertEqual((None, {'foo': 'bar', 'storage_kind': 'header'},
1788
1788
            'info', None, None), record)
1789
 
        record = record_iter.next()
 
1789
        record = next(record_iter)
1790
1790
        self.assertEqual(("Record body", {'storage_kind': 'fulltext',
1791
1791
                          'parents': ['1', '3']}, 'file', 'revid', 'fileid'),
1792
1792
                          record)
1816
1816
        writer.end()
1817
1817
        fileobj.seek(0)
1818
1818
        record_iter = v4.BundleReader(fileobj).iter_records()
1819
 
        record = record_iter.next()
 
1819
        record = next(record_iter)
1820
1820
        self.assertEqual((None, {'foo': 'bar', 'storage_kind': 'header'},
1821
1821
            'info', None, None), record)
1822
 
        self.assertRaises(errors.BadBundle, record_iter.next)
 
1822
        self.assertRaises(errors.BadBundle, next, record_iter)
1823
1823
 
1824
1824
 
1825
1825
class TestReadMergeableFromUrl(tests.TestCaseWithTransport):