/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 bzrlib/tests/test_bundle.py

  • Committer: Jelmer Vernooij
  • Date: 2012-01-24 03:04:58 UTC
  • mto: This revision was merged to the branch mainline in revision 6464.
  • Revision ID: jelmer@samba.org-20120124030458-aj2syolemmi6knri
Fix more tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_bundle.py
77
77
    inventory = property(lambda x:x)
78
78
    root_inventory = property(lambda x:x)
79
79
 
 
80
    def get_root_id(self):
 
81
        return self.root.file_id
 
82
 
80
83
    def all_file_ids(self):
81
84
        return set(self.paths.keys())
82
85
 
99
102
        for path, file_id in self.ids.iteritems():
100
103
            yield path, self[file_id]
101
104
 
102
 
    def get_file_kind(self, file_id):
 
105
    def kind(self, file_id):
103
106
        if file_id in self.contents:
104
107
            kind = 'file'
105
108
        else:
110
113
        from bzrlib.inventory import (InventoryEntry, InventoryFile
111
114
                                    , InventoryDirectory, InventoryLink)
112
115
        name = os.path.basename(path)
113
 
        kind = self.get_file_kind(file_id)
 
116
        kind = self.kind(file_id)
114
117
        parent_id = self.parent_id(file_id)
115
118
        text_sha_1, text_size = self.contents_stats(file_id)
116
119
        if kind == 'directory':