Kaydet (Commit) aef0283f authored tarafından Jannis Leidel's avatar Jannis Leidel

Fixed #17468 -- Made sure the project/app template management command tests…

Fixed #17468 -- Made sure the project/app template management command tests correctly handle an existing directory on Windows.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17377 bcc190cf-cafb-0310-a4f2-bffc1f526a37
üst c35399ba
from __future__ import with_statement from __future__ import with_statement
import cgi import cgi
import errno
import mimetypes import mimetypes
import os import os
import posixpath import posixpath
...@@ -77,7 +78,11 @@ class TemplateCommand(BaseCommand): ...@@ -77,7 +78,11 @@ class TemplateCommand(BaseCommand):
try: try:
os.makedirs(top_dir) os.makedirs(top_dir)
except OSError, e: except OSError, e:
raise CommandError(e) if e.errno == errno.EEXIST:
message = "'%s' already exists" % top_dir
else:
message = e
raise CommandError(message)
else: else:
top_dir = path.expanduser(target) top_dir = path.expanduser(target)
......
...@@ -1382,7 +1382,7 @@ class StartProject(LiveServerTestCase, AdminScriptTestCase): ...@@ -1382,7 +1382,7 @@ class StartProject(LiveServerTestCase, AdminScriptTestCase):
# running again.. # running again..
out, err = self.run_django_admin(args) out, err = self.run_django_admin(args)
self.assertNoOutput(out) self.assertNoOutput(out)
self.assertOutput(err, "File exists") self.assertOutput(err, "already exists")
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"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment