~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_trace.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:
253
253
        # If _open_bzr_log cannot open the file, then we should write the
254
254
        # warning to stderr. Since this is normally happening before logging is
255
255
        # set up.
256
 
        self.addCleanup(setattr, sys, 'stderr', sys.stderr)
257
 
        self.addCleanup(setattr, trace, '_bzr_log_filename',
258
 
                        trace._bzr_log_filename)
 
256
        self.addAttrCleanup(sys, 'stderr')
259
257
        sys.stderr = StringIO()
260
258
        # Set the log file to something that cannot exist
261
259
        os.environ['BZR_LOG'] = os.getcwd() + '/no-dir/bzr.log'
 
260
        self.addAttrCleanup(trace, '_bzr_log_filename')
262
261
        logf = trace._open_bzr_log()
263
262
        self.assertIs(None, logf)
264
263
        self.assertContainsRe(sys.stderr.getvalue(),