summaryrefslogtreecommitdiff
path: root/django/core/management/commands/testserver.py
diff options
context:
space:
mode:
Diffstat (limited to 'django/core/management/commands/testserver.py')
-rw-r--r--django/core/management/commands/testserver.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/django/core/management/commands/testserver.py b/django/core/management/commands/testserver.py
index 6c75a3e2b6..d3d9698c9a 100644
--- a/django/core/management/commands/testserver.py
+++ b/django/core/management/commands/testserver.py
@@ -4,6 +4,8 @@ from optparse import make_option
class Command(BaseCommand):
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',
type='string', default='',
help='port number or ipaddr:port to run the server on'),
@@ -18,10 +20,11 @@ class Command(BaseCommand):
from django.db import connection
verbosity = int(options.get('verbosity', 1))
+ interactive = options.get('interactive', True)
addrport = options.get('addrport')
# 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.
call_command('loaddata', *fixture_labels, **{'verbosity': verbosity})