← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_workingtree/test_eol_conversion.py

  • Committer: Robert Collins
  • Date: 2010-04-08 04:34:03 UTC
  • mfrom: (5138 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5139.
  • Revision ID: robertc@robertcollins.net-20100408043403-56z0d07vdqrx7f3t
Update bugfix for 528114 to trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_workingtree/test_eol_conversion.py
67
67
 
68
68
    def prepare_tree(self, content, eol=None):
69
69
        """Prepare a working tree and commit some content."""
70
 
        def restore_real_rules_searcher():
71
 
            WorkingTree._get_rules_searcher = self.real_rules_searcher
72
 
        self.real_rules_searcher = WorkingTree._get_rules_searcher
73
 
        self.addCleanup(restore_real_rules_searcher)
 
70
        self.real_rules_searcher = self.overrideAttr(
 
71
            WorkingTree, '_get_rules_searcher')
74
72
        self.patch_rules_searcher(eol)
75
73
        t = self.make_branch_and_tree('tree1')
76
74
        self.build_tree_contents([('tree1/file1', content)])