summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2013-01-09 19:59:24 +0100
committerClaude Paroz <claude@2xlibre.net>2013-01-09 20:02:09 +0100
commite6949373b0e4fcacde4cc269b647f1e1be8cade9 (patch)
treeaa57c232c06b5f43000229872130fc290f246a6b /tests
parentefa3f71cc4d35afe7e1ca479de2eca7808215d6f (diff)
Skipped deprecation warning test on Python 2.6
Refs #19546. On Python 2.6, DeprecationWarnings are visible by default.
Diffstat (limited to 'tests')
-rw-r--r--tests/regressiontests/test_runner/tests.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/regressiontests/test_runner/tests.py b/tests/regressiontests/test_runner/tests.py
index 685e88d6ee..27a1ea9ca5 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,