summaryrefslogtreecommitdiff
path: root/tests/test_runner/test_debug_sql.py
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2017-02-17 19:45:34 -0500
committerTim Graham <timograham@gmail.com>2017-09-25 17:11:03 -0400
commitcfff2af02be40106d4759cc6f8bfa476ce82421c (patch)
tree2680ff4040dd83d7b50ca2265e8268e362142476 /tests/test_runner/test_debug_sql.py
parenta80903b7114c984b5087597e8c34750e7bb44f51 (diff)
Fixed #27857 -- Dropped support for Python 3.4.
Diffstat (limited to 'tests/test_runner/test_debug_sql.py')
-rw-r--r--tests/test_runner/test_debug_sql.py20
1 files changed, 7 insertions, 13 deletions
diff --git a/tests/test_runner/test_debug_sql.py b/tests/test_runner/test_debug_sql.py
index 2ac7203051..8c4cb6fef6 100644
--- a/tests/test_runner/test_debug_sql.py
+++ b/tests/test_runner/test_debug_sql.py
@@ -1,4 +1,3 @@
-import sys
import unittest
from io import StringIO
@@ -94,18 +93,13 @@ class TestDebugSQL(unittest.TestCase):
]
verbose_expected_outputs = [
- # 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',
- 'runTest (test_runner.test_debug_sql.{}PassingSubTest) ... ok',
- # If there are errors/failures in subtests but not in test itself,
- # the status is not written. That behavior comes from Python.
- 'runTest (test_runner.test_debug_sql.{}FailingSubTest) ...',
- 'runTest (test_runner.test_debug_sql.{}ErrorSubTest) ...',
- ]
- ] + [
+ 'runTest (test_runner.test_debug_sql.TestDebugSQL.FailingTest) ... FAIL',
+ 'runTest (test_runner.test_debug_sql.TestDebugSQL.ErrorTest) ... ERROR',
+ 'runTest (test_runner.test_debug_sql.TestDebugSQL.PassingTest) ... ok',
+ # If there are errors/failures in subtests but not in test itself,
+ # the status is not written. That behavior comes from Python.
+ 'runTest (test_runner.test_debug_sql.TestDebugSQL.FailingSubTest) ...',
+ 'runTest (test_runner.test_debug_sql.TestDebugSQL.ErrorSubTest) ...',
('''SELECT COUNT(*) AS "__count" '''
'''FROM "test_runner_person" WHERE '''
'''"test_runner_person"."first_name" = 'pass';'''),