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

  • Committer: Martin von Gagern
  • Date: 2011-05-27 12:27:01 UTC
  • mfrom: (5925 +trunk)
  • mto: (5939.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5940.
  • Revision ID: martin.vgagern@gmx.net-20110527122701-92k938sa9ntxp26l
merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_workingtree_4.py
190
190
        # it's given; any calls to forbidden methods will raise an
191
191
        # AssertionError
192
192
        repo = tree.branch.repository
193
 
        repo.get_revision = self.fail
194
 
        repo.get_inventory = self.fail
195
 
        repo._get_inventory_xml = self.fail
 
193
        self.overrideAttr(repo, "get_revision", self.fail)
 
194
        self.overrideAttr(repo, "get_inventory", self.fail)
 
195
        self.overrideAttr(repo, "_get_inventory_xml", self.fail)
196
196
        # try to set the parent trees.
197
197
        tree.set_parent_trees([(rev1, rev1_tree)])
198
198
 
230
230
        # answer 'get_parent_ids' for the revision tree- dirstate does not
231
231
        # cache the parents of a parent tree at this point.
232
232
        #repo.get_revision = self.fail
233
 
        repo.get_inventory = self.fail
234
 
        repo._get_inventory_xml = self.fail
 
233
        self.overrideAttr(repo, "get_inventory", self.fail)
 
234
        self.overrideAttr(repo, "_get_inventory_xml", self.fail)
235
235
        # set the parent trees.
236
236
        tree.set_parent_trees([(rev1, rev1_tree), (rev2, rev2_tree)])
237
237
        # read the first tree