← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_bundle.py

  • Committer: Jelmer Vernooij
  • Date: 2012-02-17 17:01:07 UTC
  • mto: This revision was merged to the branch mainline in revision 6470.
  • Revision ID: jelmer@samba.org-20120217170107-35qj95jykcdpzk62
Fix remaining test.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_bundle.py
111
111
        return kind
112
112
 
113
113
    def make_entry(self, file_id, path):
114
 
        from bzrlib.inventory import (InventoryEntry, InventoryFile
115
 
                                    , InventoryDirectory, InventoryLink)
 
114
        from bzrlib.inventory import (InventoryFile , InventoryDirectory,
 
115
            InventoryLink)
116
116
        name = os.path.basename(path)
117
117
        kind = self.kind(file_id)
118
118
        parent_id = self.parent_id(file_id)
155
155
    def get_file_revision(self, file_id):
156
156
        return self.inventory[file_id].revision
157
157
 
 
158
    def get_file_size(self, file_id):
 
159
        return self.inventory[file_id].text_size
 
160
 
 
161
    def get_file_sha1(self, file_id):
 
162
        return self.inventory[file_id].text_sha1
 
163
 
158
164
    def contents_stats(self, file_id):
159
165
        if file_id not in self.contents:
160
166
            return None, None
323
329
        self.assertTrue(btree.path2id("grandparent/parent/file") is None)
324
330
 
325
331
    def sorted_ids(self, tree):
326
 
        ids = list(tree)
 
332
        ids = list(tree.all_file_ids())
327
333
        ids.sort()
328
334
        return ids
329
335