← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_symbol_versioning.py

  • Committer: Danny van Heumen
  • Date: 2010-03-09 16:38:10 UTC
  • mto: (4634.139.5 2.0)
  • mto: This revision was merged to the branch mainline in revision 5160.
  • Revision ID: danny@dannyvanheumen.nl-20100309163810-ujn8hcx08f75nlf1
Refined test to make use of locking hooks and also validate if lock is truly a checkout-lock.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_symbol_versioning.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2006, 2007, 2009 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
179
179
    def check_deprecated_callable(self, expected_warning, expected_docstring,
180
180
                                  expected_name, expected_module,
181
181
                                  deprecated_callable):
182
 
        if __doc__ is None:
183
 
            # With -OO the docstring should just be the deprecated version
184
 
            expected_docstring = expected_docstring.split('\n')[-2].lstrip()
185
182
        old_warning_method = symbol_versioning.warn
186
183
        try:
187
184
            symbol_versioning.set_warning_method(self.capture_warning)
241
238
        symbol_versioning.suppress_deprecation_warnings()
242
239
        self.assertFirstWarning('ignore', DeprecationWarning)
243
240
 
244
 
    def test_set_restore_filters(self):
245
 
        original_filters = warnings.filters[:]
246
 
        symbol_versioning.suppress_deprecation_warnings()()
247
 
        self.assertEqual(original_filters, warnings.filters)
248
 
 
249
241
    def test_suppress_deprecation_with_warning_filter(self):
250
242
        """don't suppress if we already have a filter"""
251
243
        warnings.filterwarnings('error', category=Warning)