~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_workingtree_4.py

  • Committer: Vincent Ladeuil
  • Date: 2010-01-25 15:55:48 UTC
  • mto: (4985.1.4 add-attr-cleanup)
  • mto: This revision was merged to the branch mainline in revision 4988.
  • Revision ID: v.ladeuil+lp@free.fr-20100125155548-0l352pujvt5bzl5e
Deploy addAttrCleanup on the whole test suite.

Several use case worth mentioning:

- setting a module or any other object attribute is the majority
by far. In some cases the setting itself is deferred but most of
the time we want to set at the same time we add the cleanup.

- there multiple occurrences of protecting hooks or ui factory
which are now useless (the test framework takes care of that now),

- there was some lambda uses that can now be avoided.

That first cleanup already simplifies things a lot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
555
555
        tree.commit('one', rev_id='rev-1')
556
556
        # Trap osutils._walkdirs_utf8 to spy on what dirs have been accessed.
557
557
        returned = []
558
 
        orig_walkdirs = osutils._walkdirs_utf8
559
 
        def reset():
560
 
            osutils._walkdirs_utf8 = orig_walkdirs
561
 
        self.addCleanup(reset)
 
558
        # XXX: Brittle code below (restore_attribute may not return the right
 
559
        # value) -- vila 100123
 
560
        orig_walkdirs = self.addAttrCleanup(osutils, '_walkdirs_utf8')
562
561
        def walkdirs_spy(*args, **kwargs):
563
562
            for val in orig_walkdirs(*args, **kwargs):
564
563
                returned.append(val[0][0])