Ticket #18318: django-ticket18318.diff

tests/regressiontests/admin_scripts/tests.py

@@ -13 +13 @@
 
 from django import conf, bin, get_version
 from django.conf import settings
+from django.db import connection
 from django.test.simple import DjangoTestSuiteRunner
 from django.utils import unittest
 from django.test import LiveServerTestCase
 
 test_dir = os.path.dirname(os.path.dirname(__file__))
-expected_query_re = re.compile(r'CREATE TABLE [`"]admin_scripts_article[`"]', re.IGNORECASE)
-
 
 class AdminScriptTestCase(unittest.TestCase):
     def write_settings(self, filename, apps=None, is_dir=False, sdict=None):
@@ -859 +858 @@
         "alternate: manage.py builtin commands work with settings provided as argument"
         args = ['sqlall', '--settings=alternate_settings', 'admin_scripts']
         out, err = self.run_manage(args)
-        self.assertRegexpMatches(out, expected_query_re)
+        expected = r'create table %s' % connection.ops.quote_name('admin_scripts_article')
+        self.assertTrue(expected in out.lower())
         self.assertNoOutput(err)
 
     def test_builtin_with_environment(self):
         "alternate: manage.py builtin commands work if settings are provided in the environment"
         args = ['sqlall', 'admin_scripts']
         out, err = self.run_manage(args, 'alternate_settings')
-        self.assertRegexpMatches(out, expected_query_re)
+        expected = r'create table %s' % connection.ops.quote_name('admin_scripts_article')
+        self.assertTrue(expected in out.lower())
         self.assertNoOutput(err)
 
     def test_builtin_with_bad_settings(self):