/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_tree/test_tree.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-03-24 12:34:34 UTC
  • mfrom: (6874.2.9 iter-files-bytes)
  • Revision ID: breezy.the.bot@gmail.com-20180324123434-zogy2xskr96vv5xm
Change Tree.iter_files_bytes() to take a (path, identifier) list rather than a (file_id, identifier) list.

Merged from https://code.launchpad.net/~jelmer/brz/iter-files-bytes/+merge/340578

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_tree/test_tree.py
232
232
        tree.lock_read()
233
233
        self.addCleanup(tree.unlock)
234
234
        extracted = dict((i, ''.join(b)) for i, b in
235
 
                         tree.iter_files_bytes([(tree.path2id('foo'), 'id1'),
236
 
                                                (tree.path2id('bar'), 'id2'),
237
 
                                                (tree.path2id('baz'), 'id3')]))
 
235
                         tree.iter_files_bytes([('foo', 'id1'),
 
236
                                                ('bar', 'id2'),
 
237
                                                ('baz', 'id3')]))
238
238
        self.assertEqual('foo', extracted['id1'])
239
239
        self.assertEqual('bar', extracted['id2'])
240
240
        self.assertEqual('baz', extracted['id3'])
241
 
        self.assertRaises(errors.NoSuchId, lambda: list(
 
241
        self.assertRaises(errors.NoSuchFile, lambda: list(
242
242
                          tree.iter_files_bytes(
243
 
                          [('qux-id', 'file1-notpresent')])))
 
243
                          [('qux', 'file1-notpresent')])))
244
244
 
245
245
 
246
246
class TestConflicts(TestCaseWithTree):