/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: Jelmer Vernooij
  • Date: 2018-03-24 10:24:48 UTC
  • mfrom: (6910 work)
  • mto: This revision was merged to the branch mainline in revision 6913.
  • Revision ID: jelmer@jelmer.uk-20180324102448-132p8l8t5ogdzhhu
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_shelf.py
206
206
 
207
207
    def check_shelve_creation(self, creator, tree):
208
208
        self.assertRaises(StopIteration,
209
 
                          next, tree.iter_entries_by_dir(['foo-id']))
 
209
                          next, tree.iter_entries_by_dir(specific_files=['foo']))
210
210
        s_trans_id = creator.shelf_transform.trans_id_file_id('foo-id')
211
211
        self.assertEqual('foo-id',
212
212
                         creator.shelf_transform.final_file_id(s_trans_id))
349
349
        creator.shelve_creation('foo-id')
350
350
        creator.transform()
351
351
        self.assertRaises(StopIteration,
352
 
                          next, tree.iter_entries_by_dir(['foo-id']))
 
352
                          next, tree.iter_entries_by_dir(specific_files=['foo']))
353
353
        self.assertShelvedFileEqual('', creator, 'foo-id')
354
354
        s_trans_id = creator.shelf_transform.trans_id_file_id('foo-id')
355
355
        self.assertEqual('foo-id',