innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Refs #27804 -- Used subTest() in admin_scripts invalid name tests.

This commit is contained in:
Jon Dufresne 2019-02-05 18:06:13 -08:00 committed by Tim Graham
parent b709d70130
commit 10b0fd1576
1 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
tests/admin_scripts/tests.py
View File

@ -1893,16 +1893,17 @@ class StartProject(LiveServerTestCase, AdminScriptTestCase):
def test_invalid_project_name(self): def test_invalid_project_name(self):
"Make sure the startproject management command validates a project name" "Make sure the startproject management command validates a project name"
for bad_name in ('7testproject', '../testproject'): for bad_name in ('7testproject', '../testproject'):
args = ['startproject', bad_name] with self.subTest(project_name=bad_name):
testproject_dir = os.path.join(self.test_dir, bad_name) args = ['startproject', bad_name]
testproject_dir = os.path.join(self.test_dir, bad_name)
out, err = self.run_django_admin(args) out, err = self.run_django_admin(args)
self.assertOutput( self.assertOutput(
err, err,
"Error: '%s' is not a valid project name. Please make " "Error: '%s' is not a valid project name. Please make "
"sure the name is a valid identifier." % bad_name "sure the name is a valid identifier." % bad_name
) )
self.assertFalse(os.path.exists(testproject_dir)) self.assertFalse(os.path.exists(testproject_dir))
def test_importable_project_name(self): def test_importable_project_name(self):
""" """
@ -2095,16 +2096,17 @@ class StartApp(AdminScriptTestCase):
def test_invalid_name(self): def test_invalid_name(self):
"""startapp validates that app name is a valid Python identifier.""" """startapp validates that app name is a valid Python identifier."""
for bad_name in ('7testproject', '../testproject'): for bad_name in ('7testproject', '../testproject'):
args = ['startapp', bad_name] with self.subTest(app_name=bad_name):
testproject_dir = os.path.join(self.test_dir, bad_name) args = ['startapp', bad_name]
testproject_dir = os.path.join(self.test_dir, bad_name)
out, err = self.run_django_admin(args) out, err = self.run_django_admin(args)
self.assertOutput( self.assertOutput(
err, err,
"CommandError: '{}' is not a valid app name. Please make " "CommandError: '{}' is not a valid app name. Please make "
"sure the name is a valid identifier.".format(bad_name) "sure the name is a valid identifier.".format(bad_name)
) )
self.assertFalse(os.path.exists(testproject_dir)) self.assertFalse(os.path.exists(testproject_dir))
def test_importable_name(self): def test_importable_name(self):
""" """