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

Fixed #12619 -- Added support for the --noinput flag to testserver. Thanks to clouserw for the suggestion, and darkrho for the patch. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13365 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Russell Keith-Magee 2010-06-21 12:09:25 +00:00
parent 6ab3fea113
commit 0dce7b6921
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
django/core/management/commands/testserver.py
View File

@ -4,6 +4,8 @@ from optparse import make_option
class Command(BaseCommand): class Command(BaseCommand):
option_list = BaseCommand.option_list + ( option_list = BaseCommand.option_list + (
make_option('--noinput', action='store_false', dest='interactive', default=True,
help='Tells Django to NOT prompt the user for input of any kind.'),
make_option('--addrport', action='store', dest='addrport', make_option('--addrport', action='store', dest='addrport',
type='string', default='', type='string', default='',
help='port number or ipaddr:port to run the server on'), help='port number or ipaddr:port to run the server on'),
@ -18,10 +20,11 @@ class Command(BaseCommand):
from django.db import connection from django.db import connection
verbosity = int(options.get('verbosity', 1)) verbosity = int(options.get('verbosity', 1))
interactive = options.get('interactive', True)
addrport = options.get('addrport') addrport = options.get('addrport')
# Create a test database. # Create a test database.
db_name = connection.creation.create_test_db(verbosity=verbosity) db_name = connection.creation.create_test_db(verbosity=verbosity, autoclobber=not interactive)
# Import the fixture data into the test database. # Import the fixture data into the test database.
call_command('loaddata', *fixture_labels, **{'verbosity': verbosity}) call_command('loaddata', *fixture_labels, **{'verbosity': verbosity})

7
docs/ref/django-admin.txt
View File

@ -804,8 +804,6 @@ with an appropriate extension (e.g. ``json`` or ``xml``). See the
documentation for ``loaddata`` for details on the specification of fixture documentation for ``loaddata`` for details on the specification of fixture
data files. data files.
--noinput
~~~~~~~~~
The :djadminopt:`--noinput` option may be provided to suppress all user The :djadminopt:`--noinput` option may be provided to suppress all user
prompts. prompts.
@ -889,6 +887,11 @@ To run on 1.2.3.4:7000 with a ``test`` fixture::
django-admin.py testserver --addrport 1.2.3.4:7000 test django-admin.py testserver --addrport 1.2.3.4:7000 test
.. versionadded:: 1.3
The :djadminopt:`--noinput` option may be provided to suppress all user
prompts.
validate validate
-------- --------