/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_tree.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_tree.py
192
192
        :param exp_other_paths: A list of other_path values.
193
193
        :param iterator: The iterator to step
194
194
        """
195
 
        path, file_id, master_ie, other_values = iterator.next()
 
195
        path, file_id, master_ie, other_values = next(iterator)
196
196
        self.assertEqual((exp_path, exp_file_id), (path, file_id),
197
197
                         'Master entry did not match')
198
198
        if master_has_node:
244
244
        self.assertWalkerNext(u'a', 'a-id', True, [u'a'], iterator)
245
245
        self.assertWalkerNext(u'b', 'b-id', True, [u'b'], iterator)
246
246
        self.assertWalkerNext(u'b/c', 'c-id', True, [u'b/c'], iterator)
247
 
        self.assertRaises(StopIteration, iterator.next)
 
247
        self.assertRaises(StopIteration, next, iterator)
248
248
 
249
249
    def test_master_has_extra(self):
250
250
        tree = self.make_branch_and_tree('tree')
263
263
        self.assertWalkerNext(u'b', 'b-id', True, [u'b'], iterator)
264
264
        self.assertWalkerNext(u'c', 'c-id', True, [None], iterator)
265
265
        self.assertWalkerNext(u'd', 'd-id', True, [u'd'], iterator)
266
 
        self.assertRaises(StopIteration, iterator.next)
 
266
        self.assertRaises(StopIteration, next, iterator)
267
267
 
268
268
    def test_master_renamed_to_earlier(self):
269
269
        """The record is still present, it just shows up early."""
281
281
        self.assertWalkerNext(u'a', 'a-id', True, [u'a'], iterator)
282
282
        self.assertWalkerNext(u'b', 'd-id', True, [u'd'], iterator)
283
283
        self.assertWalkerNext(u'c', 'c-id', True, [u'c'], iterator)
284
 
        self.assertRaises(StopIteration, iterator.next)
 
284
        self.assertRaises(StopIteration, next, iterator)
285
285
 
286
286
    def test_master_renamed_to_later(self):
287
287
        tree = self.make_branch_and_tree('tree')
298
298
        self.assertWalkerNext(u'a', 'a-id', True, [u'a'], iterator)
299
299
        self.assertWalkerNext(u'd', 'd-id', True, [u'd'], iterator)
300
300
        self.assertWalkerNext(u'e', 'b-id', True, [u'b'], iterator)
301
 
        self.assertRaises(StopIteration, iterator.next)
 
301
        self.assertRaises(StopIteration, next, iterator)
302
302
 
303
303
    def test_other_extra_in_middle(self):
304
304
        tree = self.make_branch_and_tree('tree')
314
314
        self.assertWalkerNext(u'a', 'a-id', True, [u'a'], iterator)
315
315
        self.assertWalkerNext(u'd', 'd-id', True, [u'd'], iterator)
316
316
        self.assertWalkerNext(u'b', 'b-id', False, [u'b'], iterator)
317
 
        self.assertRaises(StopIteration, iterator.next)
 
317
        self.assertRaises(StopIteration, next, iterator)
318
318
 
319
319
    def test_other_extra_at_end(self):
320
320
        tree = self.make_branch_and_tree('tree')
330
330
        self.assertWalkerNext(u'a', 'a-id', True, [u'a'], iterator)
331
331
        self.assertWalkerNext(u'b', 'b-id', True, [u'b'], iterator)
332
332
        self.assertWalkerNext(u'd', 'd-id', False, [u'd'], iterator)
333
 
        self.assertRaises(StopIteration, iterator.next)
 
333
        self.assertRaises(StopIteration, next, iterator)
334
334
 
335
335
    def test_others_extra_at_end(self):
336
336
        tree = self.make_branch_and_tree('tree')
356
356
        self.assertWalkerNext(u'c', 'c-id', False, [u'c', u'c', u'c'], iterator)
357
357
        self.assertWalkerNext(u'd', 'd-id', False, [None, u'd', u'd'], iterator)
358
358
        self.assertWalkerNext(u'e', 'e-id', False, [None, u'e', None], iterator)
359
 
        self.assertRaises(StopIteration, iterator.next)
 
359
        self.assertRaises(StopIteration, next, iterator)
360
360
 
361
361
    def test_different_file_id_in_others(self):
362
362
        tree = self.make_branch_and_tree('tree')
384
384
        self.assertWalkerNext(u'c', 'c-id', True, [u'c', u'c'], iterator)
385
385
        self.assertWalkerNext(u'c/d', 'b-id', True, [u'c/d', u'b'], iterator)
386
386
        self.assertWalkerNext(u'c/e', 'a-id', True, [u'a', u'a'], iterator)
387
 
        self.assertRaises(StopIteration, iterator.next)
 
387
        self.assertRaises(StopIteration, next, iterator)
388
388
 
389
389
    def assertCmpByDirblock(self, cmp_val, path1, path2):
390
390
        self.assertEqual(cmp_val,