From 242c9538c8d252f27581e2b192237301f94a2928 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Fri, 23 Jan 2015 08:23:44 -0500 Subject: [PATCH] [1.8.x] Fixed test_runner test failure on Python 3.5; refs #23763. Python change is http://bugs.python.org/issue22032 Backport of 0386b97706052b88cd6fbbf777698810981cfeb6 from master --- tests/test_runner/test_debug_sql.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tests/test_runner/test_debug_sql.py b/tests/test_runner/test_debug_sql.py index 7bc0950d84..cc583cbb37 100644 --- a/tests/test_runner/test_debug_sql.py +++ b/tests/test_runner/test_debug_sql.py @@ -1,3 +1,4 @@ +import sys import unittest from django.db import connection @@ -82,9 +83,12 @@ class TestDebugSQL(unittest.TestCase): ] verbose_expected_outputs = [ - 'runTest (test_runner.test_debug_sql.FailingTest) ... FAIL', - 'runTest (test_runner.test_debug_sql.ErrorTest) ... ERROR', - 'runTest (test_runner.test_debug_sql.PassingTest) ... ok', + # Output format changed in Python 3.5+ + x.format('' if sys.version_info < (3, 5) else 'TestDebugSQL.') for x in [ + 'runTest (test_runner.test_debug_sql.{}FailingTest) ... FAIL', + 'runTest (test_runner.test_debug_sql.{}ErrorTest) ... ERROR', + 'runTest (test_runner.test_debug_sql.{}PassingTest) ... ok', + ] ] if six.PY3: verbose_expected_outputs += [