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

  • Committer: Vincent Ladeuil
  • Date: 2010-08-28 15:34:24 UTC
  • mto: (5398.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 5399.
  • Revision ID: v.ladeuil+lp@free.fr-20100828153424-yybmcql9o0t43m7a
https://launchpad.net/bugs/625686
Fix bug #625686 by removing the warning filter added by selftest.

* bzrlib/symbol_versioning.py:
(suppress_deprecation_warnings, activate_deprecation_warnings):
Always return a cleanup callable even if no filter is installed.

* bzrlib/versionedfile.py:
Drive-by cleanup, the module is not needed.

* bzrlib/builtins.py:
(cmd_selftest.run): Ensure we restore the right warning filters.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/TestUtil.py
135
135
        >>>         result.addTests([test, test])
136
136
        >>>     return result
137
137
        """
138
 
        basic_tests = super(TestLoader, self).loadTestsFromModule(module)
 
138
        if sys.version_info < (2, 7):
 
139
            basic_tests = super(TestLoader, self).loadTestsFromModule(module)
 
140
        else:
 
141
            # GZ 2010-07-19: Python 2.7 unittest also uses load_tests but with
 
142
            #                a different and incompatible signature
 
143
            basic_tests = super(TestLoader, self).loadTestsFromModule(module,
 
144
                use_load_tests=False)
139
145
        load_tests = getattr(module, "load_tests", None)
140
146
        if load_tests is not None:
141
147
            return load_tests(basic_tests, module, self)