Author: russellm
Date: 2010-06-21 07:09:25 -0500 (Mon, 21 Jun 2010)
New Revision: 13365

Modified:
   django/trunk/django/core/management/commands/testserver.py
   django/trunk/docs/ref/django-admin.txt
Log:
Fixed #12619 -- Added support for the --noinput flag to testserver. Thanks to 
clouserw for the suggestion, and darkrho for the patch.

Modified: django/trunk/django/core/management/commands/testserver.py
===================================================================
--- django/trunk/django/core/management/commands/testserver.py  2010-06-21 
12:01:37 UTC (rev 13364)
+++ django/trunk/django/core/management/commands/testserver.py  2010-06-21 
12:09:25 UTC (rev 13365)
@@ -4,6 +4,8 @@
 
 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 @@
         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})

Modified: django/trunk/docs/ref/django-admin.txt
===================================================================
--- django/trunk/docs/ref/django-admin.txt      2010-06-21 12:01:37 UTC (rev 
13364)
+++ django/trunk/docs/ref/django-admin.txt      2010-06-21 12:09:25 UTC (rev 
13365)
@@ -804,8 +804,6 @@
 documentation for ``loaddata`` for details on the specification of fixture
 data files.
 
---noinput
-~~~~~~~~~
 The :djadminopt:`--noinput` option may be provided to suppress all user
 prompts.
 
@@ -889,6 +887,11 @@
 
     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
 --------
 

-- 
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to django-upda...@googlegroups.com.
To unsubscribe from this group, send email to 
django-updates+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en.

Reply via email to