/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_shelf.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_shelf.py
190
190
 
191
191
    def check_shelve_creation(self, creator, tree):
192
192
        self.assertRaises(StopIteration,
193
 
                          tree.iter_entries_by_dir(['foo-id']).next)
 
193
                          next, tree.iter_entries_by_dir(['foo-id']))
194
194
        s_trans_id = creator.shelf_transform.trans_id_file_id('foo-id')
195
195
        self.assertEqual('foo-id',
196
196
                         creator.shelf_transform.final_file_id(s_trans_id))
308
308
        creator.shelve_creation('foo-id')
309
309
        creator.transform()
310
310
        self.assertRaises(StopIteration,
311
 
                          tree.iter_entries_by_dir(['foo-id']).next)
 
311
                          next, tree.iter_entries_by_dir(['foo-id']))
312
312
        self.assertShelvedFileEqual('', creator, 'foo-id')
313
313
        s_trans_id = creator.shelf_transform.trans_id_file_id('foo-id')
314
314
        self.assertEqual('foo-id',
465
465
        self.addCleanup(tt.finalize)
466
466
        records = iter(parser.read_pending_records())
467
467
        #skip revision-id
468
 
        records.next()
 
468
        next(records)
469
469
        tt.deserialize(records)
470
470
 
471
471
    def test_shelve_unversioned(self):