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

  • Committer: John Arbash Meinel
  • Date: 2009-06-18 18:18:36 UTC
  • mto: This revision was merged to the branch mainline in revision 4461.
  • Revision ID: john@arbash-meinel.com-20090618181836-biodfkat9a8eyzjz
The new add_inventory_by_delta is returning a CHKInventory when mapping from NULL
Which is completely valid, but 'broke' one of the tests.
So to fix it, changed the test to use CHKInventories on both sides, and add an __eq__
member. The nice thing is that CHKInventory.__eq__ is fairly cheap, since it only
has to check the root keys.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_tree.py
123
123
        wt = self.make_branch_and_tree('.')
124
124
        delta = wt.changes_from(wt.basis_tree())
125
125
        self.assertEqual(len(delta.added), 0)
126
 
        delta = wt.changes_from(wt.basis_tree(), include_root=True)
 
126
        delta = wt.changes_from(wt.basis_tree(), wt, include_root=True)
127
127
        self.assertEqual(len(delta.added), 1)
128
128
        self.assertEqual(delta.added[0][0], '')
129
129
 
139
139
 
140
140
        # we need to pass a known file with an unknown file to get this to
141
141
        # fail when expected.
142
 
        delta = wt.changes_from(wt.basis_tree(),
 
142
        delta = wt.changes_from(wt.basis_tree(), wt,
143
143
            specific_files=['known_file', 'unknown_file'] ,
144
144
            require_versioned=False)
145
145
        self.assertEqual(len(delta.added), 1)