Commit 785ec247 authored by Claude Paroz's avatar Claude Paroz
Browse files

[1.5.x] Skipped deprecation warning test on Python 2.6 

Refs #19546. On Python 2.6, DeprecationWarnings are visible by
default.
Backport of e6949373 from master.
parent af8e858c

tests/regressiontests/test_runner/tests.py

+4 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ Tests for django test runner 
"""

from __future__ import absolute_import



import sys

from optparse import make_option



from django.core.exceptions import ImproperlyConfigured
@@ -293,11 +294,14 @@ class DeprecationDisplayTest(AdminScriptTestCase): 
        out, err = self.run_django_admin(args)

        self.assertTrue("DeprecationWarning: warning from test" in err)



    @unittest.skipIf(sys.version_info[:2] == (2, 6),

        "On Python 2.6, DeprecationWarnings are visible anyway")

    def test_runner_deprecation_verbosity_zero(self):

        args = ['test', '--settings=regressiontests.settings', '--verbosity=0']

        out, err = self.run_django_admin(args)

        self.assertFalse("DeprecationWarning: warning from test" in err)





class AutoIncrementResetTest(TransactionTestCase):

    """

    Here we test creating the same model two times in different test methods,