~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_symbol_versioning.py

  • Committer: Vincent Ladeuil
  • Date: 2007-10-09 20:32:29 UTC
  • mto: (2903.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 2904.
  • Revision ID: v.ladeuil+lp@free.fr-20071009203229-5k200m1g7mf4jf9l
Fix 149019 by using a proper line number when reporting errors.

* bzrlib/util/configobj/configobj.py:
(ConfigObj._handle_error): Trivial fix. Since cur_index is
0-based, line number was off by one.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2006, 2007, 2009 Canonical Ltd
 
1
# Copyright (C) 2006, 2007 Canonical Ltd
 
2
#   Authors: Robert Collins <robert.collins@canonical.com>
 
3
#   and others
2
4
#
3
5
# This program is free software; you can redistribute it and/or modify
4
6
# it under the terms of the GNU General Public License as published by
12
14
#
13
15
# You should have received a copy of the GNU General Public License
14
16
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
17
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
18
 
17
19
"""Symbol versioning tests."""
18
20
 
19
 
import warnings
20
 
 
21
 
from bzrlib import symbol_versioning
22
 
from bzrlib.symbol_versioning import (
23
 
    deprecated_function,
24
 
    deprecated_in,
25
 
    deprecated_list,
26
 
    deprecated_method,
27
 
    )
 
21
import bzrlib.symbol_versioning as symbol_versioning
28
22
from bzrlib.tests import TestCase
29
23
 
30
24
 
31
 
@deprecated_function(deprecated_in((0, 7, 0)))
32
 
def sample_deprecated_function():
 
25
@symbol_versioning.deprecated_function(symbol_versioning.zero_seven)
 
26
def deprecated_function():
33
27
    """Deprecated function docstring."""
34
28
    return 1
35
29
 
36
30
 
37
 
a_deprecated_list = symbol_versioning.deprecated_list(deprecated_in((0, 9, 0)),
 
31
a_deprecated_list = symbol_versioning.deprecated_list(symbol_versioning.zero_nine,
38
32
    'a_deprecated_list', ['one'], extra="Don't use me")
39
33
 
40
34
 
41
35
a_deprecated_dict = symbol_versioning.DeprecatedDict(
42
 
    deprecated_in((0, 14, 0)),
 
36
    symbol_versioning.zero_fourteen,
43
37
    'a_deprecated_dict',
44
38
    dict(a=42),
45
39
    advice='Pull the other one!',
55
49
        super(TestDeprecationWarnings, self).setUp()
56
50
        self._warnings = []
57
51
    
58
 
    @deprecated_method(deprecated_in((0, 7, 0)))
 
52
    @symbol_versioning.deprecated_method(symbol_versioning.zero_seven)
59
53
    def deprecated_method(self):
60
54
        """Deprecated method docstring.
61
 
 
 
55
        
62
56
        This might explain stuff.
63
57
        """
64
58
        return 1
65
59
 
66
60
    @staticmethod
67
 
    @deprecated_function(deprecated_in((0, 7, 0)))
 
61
    @symbol_versioning.deprecated_function(symbol_versioning.zero_seven)
68
62
    def deprecated_static():
69
63
        """Deprecated static."""
70
64
        return 1
94
88
            "TestDeprecationWarnings.deprecated_method "
95
89
            "was deprecated in version 0.7.", DeprecationWarning, 2)
96
90
        expected_docstring = ('Deprecated method docstring.\n'
97
 
                              '\n'
 
91
                              '        \n'
98
92
                              '        This might explain stuff.\n'
99
93
                              '        \n'
100
94
                              '        This method was deprecated in version 0.7.\n'
106
100
 
107
101
    def test_deprecated_function(self):
108
102
        expected_warning = (
109
 
            "bzrlib.tests.test_symbol_versioning.sample_deprecated_function "
 
103
            "bzrlib.tests.test_symbol_versioning.deprecated_function "
110
104
            "was deprecated in version 0.7.", DeprecationWarning, 2)
111
105
        expected_docstring = ('Deprecated function docstring.\n'
112
106
                              '\n'
113
107
                              'This function was deprecated in version 0.7.\n'
114
108
                              )
115
109
        self.check_deprecated_callable(expected_warning, expected_docstring,
116
 
                                       "sample_deprecated_function",
 
110
                                       "deprecated_function",
117
111
                                       "bzrlib.tests.test_symbol_versioning",
118
 
                                       sample_deprecated_function)
 
112
                                       deprecated_function)
119
113
 
120
114
    def test_deprecated_list(self):
121
115
        expected_warning = (
192
186
            self.assertTrue(deprecated_callable.is_deprecated)
193
187
        finally:
194
188
            symbol_versioning.set_warning_method(old_warning_method)
195
 
 
 
189
    
196
190
    def test_deprecated_passed(self):
197
191
        self.assertEqual(True, symbol_versioning.deprecated_passed(None))
198
192
        self.assertEqual(True, symbol_versioning.deprecated_passed(True))
207
201
            'TestDeprecationWarnings.test_deprecation_string was deprecated in '
208
202
            'version 0.11.',
209
203
            symbol_versioning.deprecation_string(
210
 
            self.test_deprecation_string,
211
 
            deprecated_in((0, 11, 0))))
 
204
            self.test_deprecation_string, symbol_versioning.zero_eleven))
212
205
        self.assertEqual('bzrlib.symbol_versioning.deprecated_function was '
213
206
            'deprecated in version 0.11.',
214
207
            symbol_versioning.deprecation_string(
215
208
                symbol_versioning.deprecated_function,
216
 
                deprecated_in((0, 11, 0))))
217
 
 
218
 
 
219
 
class TestSuppressAndActivate(TestCase):
220
 
 
221
 
    def setUp(self):
222
 
        TestCase.setUp(self)
223
 
        existing_filters = list(warnings.filters)
224
 
        def restore():
225
 
            warnings.filters[:] = existing_filters
226
 
        self.addCleanup(restore)
227
 
        # Clean out the filters so we have a clean slate.
228
 
        warnings.resetwarnings()
229
 
 
230
 
    def assertFirstWarning(self, action, category):
231
 
        """Test the first warning in the filters is correct"""
232
 
        first = warnings.filters[0]
233
 
        self.assertEqual((action, category), (first[0], first[2]))
234
 
 
235
 
    def test_suppress_deprecation_warnings(self):
236
 
        """suppress_deprecation_warnings sets DeprecationWarning to ignored."""
237
 
        symbol_versioning.suppress_deprecation_warnings()
238
 
        self.assertFirstWarning('ignore', DeprecationWarning)
239
 
 
240
 
    def test_suppress_deprecation_with_warning_filter(self):
241
 
        """don't suppress if we already have a filter"""
242
 
        warnings.filterwarnings('error', category=Warning)
243
 
        self.assertFirstWarning('error', Warning)
244
 
        self.assertEqual(1, len(warnings.filters))
245
 
        symbol_versioning.suppress_deprecation_warnings(override=False)
246
 
        self.assertFirstWarning('error', Warning)
247
 
        self.assertEqual(1, len(warnings.filters))
248
 
 
249
 
    def test_suppress_deprecation_with_filter(self):
250
 
        """don't suppress if we already have a filter"""
251
 
        warnings.filterwarnings('error', category=DeprecationWarning)
252
 
        self.assertFirstWarning('error', DeprecationWarning)
253
 
        self.assertEqual(1, len(warnings.filters))
254
 
        symbol_versioning.suppress_deprecation_warnings(override=False)
255
 
        self.assertFirstWarning('error', DeprecationWarning)
256
 
        self.assertEqual(1, len(warnings.filters))
257
 
        symbol_versioning.suppress_deprecation_warnings(override=True)
258
 
        self.assertFirstWarning('ignore', DeprecationWarning)
259
 
        self.assertEqual(2, len(warnings.filters))
260
 
 
261
 
    def test_activate_deprecation_no_error(self):
262
 
        # First nuke the filters, so we know it is clean
263
 
        symbol_versioning.activate_deprecation_warnings()
264
 
        self.assertFirstWarning('default', DeprecationWarning)
265
 
 
266
 
    def test_activate_deprecation_with_error(self):
267
 
        # First nuke the filters, so we know it is clean
268
 
        # Add a warning == error rule
269
 
        warnings.filterwarnings('error', category=Warning)
270
 
        self.assertFirstWarning('error', Warning)
271
 
        self.assertEqual(1, len(warnings.filters))
272
 
        symbol_versioning.activate_deprecation_warnings(override=False)
273
 
        # There should not be a new warning
274
 
        self.assertFirstWarning('error', Warning)
275
 
        self.assertEqual(1, len(warnings.filters))
276
 
 
277
 
    def test_activate_deprecation_with_DW_error(self):
278
 
        # First nuke the filters, so we know it is clean
279
 
        # Add a warning == error rule
280
 
        warnings.filterwarnings('error', category=DeprecationWarning)
281
 
        self.assertFirstWarning('error', DeprecationWarning)
282
 
        self.assertEqual(1, len(warnings.filters))
283
 
        symbol_versioning.activate_deprecation_warnings(override=False)
284
 
        # There should not be a new warning
285
 
        self.assertFirstWarning('error', DeprecationWarning)
286
 
        self.assertEqual(1, len(warnings.filters))
287
 
        symbol_versioning.activate_deprecation_warnings(override=True)
288
 
        self.assertFirstWarning('default', DeprecationWarning)
289
 
        self.assertEqual(2, len(warnings.filters))
 
209
                symbol_versioning.zero_eleven))