~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_lazy_import.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:
452
452
        self.actions = []
453
453
        InstrumentedImportReplacer.use_actions(self.actions)
454
454
 
 
455
        sys.path.append(base_path)
 
456
        self.addCleanup(sys.path.remove, base_path)
 
457
 
455
458
        original_import = __import__
456
459
        def instrumented_import(mod, scope1, scope2, fromlist):
457
460
            self.actions.append(('import', mod, fromlist))
458
461
            return original_import(mod, scope1, scope2, fromlist)
459
 
 
460
462
        def cleanup():
461
 
            if base_path in sys.path:
462
 
                sys.path.remove(base_path)
463
463
            __builtins__['__import__'] = original_import
464
464
        self.addCleanup(cleanup)
465
 
        sys.path.append(base_path)
466
465
        __builtins__['__import__'] = instrumented_import
467
466
 
468
467
    def create_modules(self):