From 785ec24720b3d7b38cf683f298b730c0c4014ac9 Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Wed, 9 Jan 2013 19:59:24 +0100 Subject: [PATCH] [1.5.x] Skipped deprecation warning test on Python 2.6 Refs #19546. On Python 2.6, DeprecationWarnings are visible by default. Backport of e6949373b from master. --- tests/regressiontests/test_runner/tests.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/regressiontests/test_runner/tests.py b/tests/regressiontests/test_runner/tests.py index 685e88d6ee8..27a1ea9ca5f 100644 --- a/tests/regressiontests/test_runner/tests.py +++ b/tests/regressiontests/test_runner/tests.py @@ -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,