Tweaked admin_scripts tests enhanced in r16964 a bit more so they don't fail with Oracle.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16999 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
313fab8623
commit
d48510cc6b
|
@ -864,14 +864,16 @@ class ManageAlternateSettings(AdminScriptTestCase):
|
||||||
"alternate: manage.py builtin commands work with settings provided as argument"
|
"alternate: manage.py builtin commands work with settings provided as argument"
|
||||||
args = ['sqlall','--settings=alternate_settings', 'admin_scripts']
|
args = ['sqlall','--settings=alternate_settings', 'admin_scripts']
|
||||||
out, err = self.run_manage(args)
|
out, err = self.run_manage(args)
|
||||||
self.assertRegexpMatches(out, 'CREATE TABLE [`"]admin_scripts_article[`"]')
|
expected_query_re = re.compile('CREATE TABLE [`"]admin_scripts_article[`"]', re.IGNORECASE)
|
||||||
|
self.assertRegexpMatches(out, expected_query_re)
|
||||||
self.assertNoOutput(err)
|
self.assertNoOutput(err)
|
||||||
|
|
||||||
def test_builtin_with_environment(self):
|
def test_builtin_with_environment(self):
|
||||||
"alternate: manage.py builtin commands work if settings are provided in the environment"
|
"alternate: manage.py builtin commands work if settings are provided in the environment"
|
||||||
args = ['sqlall','admin_scripts']
|
args = ['sqlall','admin_scripts']
|
||||||
out, err = self.run_manage(args,'alternate_settings')
|
out, err = self.run_manage(args,'alternate_settings')
|
||||||
self.assertRegexpMatches(out, 'CREATE TABLE [`"]admin_scripts_article[`"]')
|
expected_query_re = re.compile('CREATE TABLE [`"]admin_scripts_article[`"]', re.IGNORECASE)
|
||||||
|
self.assertRegexpMatches(out, expected_query_re)
|
||||||
self.assertNoOutput(err)
|
self.assertNoOutput(err)
|
||||||
|
|
||||||
def test_builtin_with_bad_settings(self):
|
def test_builtin_with_bad_settings(self):
|
||||||
|
|
Loading…
Reference in New Issue