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

  • Committer: Martin
  • Date: 2017-05-25 01:35:55 UTC
  • mto: This revision was merged to the branch mainline in revision 6637.
  • Revision ID: gzlist@googlemail.com-20170525013555-lepzczdnzb9r272j
Apply 2to3 next fixer and make compatible

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_versionedfile.py
890
890
    def test_get_record_stream(self):
891
891
        self.setup_abcde()
892
892
        def get_record(suffix):
893
 
            return self.plan_merge_vf.get_record_stream(
894
 
                [('root', suffix)], 'unordered', True).next()
 
893
            return next(self.plan_merge_vf.get_record_stream(
 
894
                [('root', suffix)], 'unordered', True))
895
895
        self.assertEqual('a', get_record('A').get_bytes_as('fulltext'))
896
896
        self.assertEqual('c', get_record('C').get_bytes_as('fulltext'))
897
897
        self.assertEqual('e', get_record('E:').get_bytes_as('fulltext'))
1225
1225
        """Grab the interested adapted texts for tests."""
1226
1226
        # origin is a fulltext
1227
1227
        entries = f.get_record_stream([('origin',)], 'unordered', False)
1228
 
        base = entries.next()
 
1228
        base = next(entries)
1229
1229
        ft_data = ft_adapter.get_bytes(base)
1230
1230
        # merged is both a delta and multiple parents.
1231
1231
        entries = f.get_record_stream([('merged',)], 'unordered', False)
1232
 
        merged = entries.next()
 
1232
        merged = next(entries)
1233
1233
        delta_data = delta_adapter.get_bytes(merged)
1234
1234
        return ft_data, delta_data
1235
1235
 
1637
1637
                vf._add_text, new_key, [], ''.join(lines),
1638
1638
                nostore_sha=sha)
1639
1639
            # and no new version should have been added.
1640
 
            record = vf.get_record_stream([new_key], 'unordered', True).next()
 
1640
            record = next(vf.get_record_stream([new_key], 'unordered', True))
1641
1641
            self.assertEqual('absent', record.storage_kind)
1642
1642
 
1643
1643
    def test_add_lines_nostoresha(self):
2002
2002
        key = self.get_simple_key('foo')
2003
2003
        files.add_lines(key, (), ['my text\n', 'content'])
2004
2004
        stream = files.get_record_stream([key], 'unordered', False)
2005
 
        record = stream.next()
 
2005
        record = next(stream)
2006
2006
        if record.storage_kind in ('chunked', 'fulltext'):
2007
2007
            # chunked and fulltext representations are for direct use not wire
2008
2008
            # serialisation: check they are able to be used directly. To send
2785
2785
    def test_get_record_stream(self):
2786
2786
        self._lines["A"] = ["FOO", "BAR"]
2787
2787
        it = self.texts.get_record_stream([("A",)], "unordered", True)
2788
 
        record = it.next()
 
2788
        record = next(it)
2789
2789
        self.assertEqual("chunked", record.storage_kind)
2790
2790
        self.assertEqual("FOOBAR", record.get_bytes_as("fulltext"))
2791
2791
        self.assertEqual(["FOO", "BAR"], record.get_bytes_as("chunked"))
2792
2792
 
2793
2793
    def test_get_record_stream_absent(self):
2794
2794
        it = self.texts.get_record_stream([("A",)], "unordered", True)
2795
 
        record = it.next()
 
2795
        record = next(it)
2796
2796
        self.assertEqual("absent", record.storage_kind)
2797
2797
 
2798
2798
    def test_iter_lines_added_or_present_in_keys(self):