← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_status.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/test_status.py
53
53
        tree2.commit('commit 3b', timestamp=1196796819, timezone=0)
54
54
        tree3.commit('commit 3c', timestamp=1196796819, timezone=0)
55
55
        tree.merge_from_branch(tree2.branch)
56
 
        tree.merge_from_branch(tree3.branch)
 
56
        tree.merge_from_branch(tree3.branch, force=True)
57
57
        return tree
58
58
 
59
59
    def test_multiple_pending(self):