From 4f6a7663bcddffb114f2647f9928cbf1fdd8e4b5 Mon Sep 17 00:00:00 2001 From: Aymeric Augustin Date: Sun, 13 Sep 2015 09:30:35 +0200 Subject: Refs #14091 -- Fixed connection.queries on SQLite. --- tests/test_runner/test_debug_sql.py | 48 ++++++++++--------------------------- 1 file changed, 12 insertions(+), 36 deletions(-) (limited to 'tests/test_runner/test_debug_sql.py') diff --git a/tests/test_runner/test_debug_sql.py b/tests/test_runner/test_debug_sql.py index b943e83e31..e230066100 100644 --- a/tests/test_runner/test_debug_sql.py +++ b/tests/test_runner/test_debug_sql.py @@ -61,28 +61,14 @@ class TestDebugSQL(unittest.TestCase): for output in self.verbose_expected_outputs: self.assertIn(output, full_output) - if six.PY3: - expected_outputs = [ - ('''QUERY = 'SELECT COUNT(*) AS "__count" ''' - '''FROM "test_runner_person" WHERE ''' - '''"test_runner_person"."first_name" = %s' ''' - '''- PARAMS = ('error',);'''), - ('''QUERY = 'SELECT COUNT(*) AS "__count" ''' - '''FROM "test_runner_person" WHERE ''' - '''"test_runner_person"."first_name" = %s' ''' - '''- PARAMS = ('fail',);'''), - ] - else: - expected_outputs = [ - ('''QUERY = u'SELECT COUNT(*) AS "__count" ''' - '''FROM "test_runner_person" WHERE ''' - '''"test_runner_person"."first_name" = %s' ''' - '''- PARAMS = (u'error',);'''), - ('''QUERY = u'SELECT COUNT(*) AS "__count" ''' - '''FROM "test_runner_person" WHERE ''' - '''"test_runner_person"."first_name" = %s' ''' - '''- PARAMS = (u'fail',);'''), - ] + expected_outputs = [ + ('''SELECT COUNT(*) AS "__count" ''' + '''FROM "test_runner_person" WHERE ''' + '''"test_runner_person"."first_name" = 'error';'''), + ('''SELECT COUNT(*) AS "__count" ''' + '''FROM "test_runner_person" WHERE ''' + '''"test_runner_person"."first_name" = 'fail';'''), + ] verbose_expected_outputs = [ # Output format changed in Python 3.5+ @@ -91,18 +77,8 @@ class TestDebugSQL(unittest.TestCase): 'runTest (test_runner.test_debug_sql.{}ErrorTest) ... ERROR', 'runTest (test_runner.test_debug_sql.{}PassingTest) ... ok', ] + ] + [ + ('''SELECT COUNT(*) AS "__count" ''' + '''FROM "test_runner_person" WHERE ''' + '''"test_runner_person"."first_name" = 'pass';'''), ] - if six.PY3: - verbose_expected_outputs += [ - ('''QUERY = 'SELECT COUNT(*) AS "__count" ''' - '''FROM "test_runner_person" WHERE ''' - '''"test_runner_person"."first_name" = %s' ''' - '''- PARAMS = ('pass',);'''), - ] - else: - verbose_expected_outputs += [ - ('''QUERY = u'SELECT COUNT(*) AS "__count" ''' - '''FROM "test_runner_person" WHERE ''' - '''"test_runner_person"."first_name" = %s' ''' - '''- PARAMS = (u'pass',);'''), - ] -- cgit v1.3