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

  • Committer: Jelmer Vernooij
  • Date: 2017-05-30 19:32:13 UTC
  • mfrom: (6637 work)
  • mto: This revision was merged to the branch mainline in revision 6639.
  • Revision ID: jelmer@jelmer.uk-20170530193213-qm21s6dc7dln237t
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_knit.py
205
205
        content1 = self._make_content([("", "a"), ("", "b")])
206
206
        content2 = self._make_content([("", "a"), ("", "a"), ("", "c")])
207
207
        it = content1.line_delta_iter(content2)
208
 
        self.assertEqual(it.next(), (1, 2, 2, ["a", "c"]))
209
 
        self.assertRaises(StopIteration, it.next)
 
208
        self.assertEqual(next(it), (1, 2, 2, ["a", "c"]))
 
209
        self.assertRaises(StopIteration, next, it)
210
210
 
211
211
 
212
212
class TestAnnotatedKnitContent(TestCase, KnitContentTestsMixin):
232
232
        content1 = self._make_content([("", "a"), ("", "b")])
233
233
        content2 = self._make_content([("", "a"), ("", "a"), ("", "c")])
234
234
        it = content1.line_delta_iter(content2)
235
 
        self.assertEqual(it.next(), (1, 2, 2, [("", "a"), ("", "c")]))
236
 
        self.assertRaises(StopIteration, it.next)
 
235
        self.assertEqual(next(it), (1, 2, 2, [("", "a"), ("", "c")]))
 
236
        self.assertRaises(StopIteration, next, it)
237
237
 
238
238
 
239
239
class MockTransport(object):
648
648
        vf, reload_counter = self.make_vf_for_retrying()
649
649
        keys = [('rev-1',), ('rev-2',), ('rev-3',)]
650
650
        record_stream = vf.get_record_stream(keys, 'topological', False)
651
 
        record = record_stream.next()
 
651
        record = next(record_stream)
652
652
        self.assertEqual(('rev-1',), record.key)
653
653
        self.assertEqual([0, 0, 0], reload_counter)
654
 
        record = record_stream.next()
 
654
        record = next(record_stream)
655
655
        self.assertEqual(('rev-2',), record.key)
656
656
        self.assertEqual([1, 1, 0], reload_counter)
657
 
        record = record_stream.next()
 
657
        record = next(record_stream)
658
658
        self.assertEqual(('rev-3',), record.key)
659
659
        self.assertEqual([1, 1, 0], reload_counter)
660
660
        # Now delete all pack files, and see that we raise the right error
2338
2338
                source = test
2339
2339
            else:
2340
2340
                source = basis
2341
 
            record = source.get_record_stream([result[0]], 'unordered',
2342
 
                True).next()
 
2341
            record = next(source.get_record_stream([result[0]], 'unordered',
 
2342
                True))
2343
2343
            self.assertEqual(record.key, result[0])
2344
2344
            self.assertEqual(record.sha1, result[1])
2345
2345
            # We used to check that the storage kind matched, but actually it
2425
2425
                source = test
2426
2426
            else:
2427
2427
                source = basis
2428
 
            record = source.get_record_stream([result[0]], 'unordered',
2429
 
                False).next()
 
2428
            record = next(source.get_record_stream([result[0]], 'unordered',
 
2429
                False))
2430
2430
            self.assertEqual(record.key, result[0])
2431
2431
            self.assertEqual(record.sha1, result[1])
2432
2432
            self.assertEqual(record.storage_kind, result[2])