Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #18318 -- Changed some tests to be 3rd party DB friendly

Thanks to manfre for report and patch.
  • Loading branch information...
commit 8ee1a664f9ef127bc488b03f478e8ba2f0dc7f19 1 parent 459c3b6
@akaariai akaariai authored
Showing with 7 additions and 4 deletions.
  1. +7 −4 tests/regressiontests/admin_scripts/tests.py
View
11 tests/regressiontests/admin_scripts/tests.py
@@ -13,13 +13,12 @@
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,14 +858,18 @@ def test_builtin_with_settings(self):
"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 = ('create table %s'
+ % connection.ops.quote_name('admin_scripts_article'))
+ self.assertTrue(expected.lower() 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 = ('create table %s'
+ % connection.ops.quote_name('admin_scripts_article'))
+ self.assertTrue(expected.lower() in out.lower())
self.assertNoOutput(err)
def test_builtin_with_bad_settings(self):
Please sign in to comment.
Something went wrong with that request. Please try again.