Navigation Menu

Skip to content

Commit

Permalink
Fixed #5376 -- Added --addrport option to the 'testserver' command. T…
Browse files Browse the repository at this point in the history
…hanks, toddobryan

git-svn-id: http://code.djangoproject.com/svn/django/trunk@6204 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information
adrianholovaty committed Sep 14, 2007
1 parent 725716b commit fe78237
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 6 deletions.
6 changes: 5 additions & 1 deletion django/core/management/commands/testserver.py
Expand Up @@ -7,6 +7,9 @@ class Command(BaseCommand):
make_option('--verbosity', action='store', dest='verbosity', default='1',
type='choice', choices=['0', '1', '2'],
help='Verbosity level; 0=minimal output, 1=normal output, 2=all output'),
make_option('--addrport', action='store', dest='addrport',
type='string', default='',
help='port number or ipaddr:port to run the server on'),
)
help = 'Runs a development server with data from the given fixture(s).'
args = '[fixture ...]'
Expand All @@ -19,6 +22,7 @@ def handle(self, *fixture_labels, **options):
from django.test.utils import create_test_db

verbosity = int(options.get('verbosity', 1))
addrport = options.get('addrport')

# Create a test database.
db_name = create_test_db(verbosity=verbosity)
Expand All @@ -30,4 +34,4 @@ def handle(self, *fixture_labels, **options):
# a strange error -- it causes this handle() method to be called
# multiple times.
shutdown_message = '\nServer stopped.\nNote that the test database, %r, has not been deleted. You can explore it on your own.' % db_name
call_command('runserver', shutdown_message=shutdown_message, use_reloader=False)
call_command('runserver', addrport=addrport, shutdown_message=shutdown_message, use_reloader=False)
30 changes: 25 additions & 5 deletions docs/django-admin.txt
Expand Up @@ -627,14 +627,34 @@ This is useful in a number of ways:
in any way, knowing that whatever data changes you're making are only
being made to a test database.

Note that this server can only run on the default port on localhost; it does
not yet accept a ``host`` or ``port`` parameter.

Also note that it does *not* automatically detect changes to your Python source
code (as ``runserver`` does). It does, however, detect changes to templates.
Note that this server does *not* automatically detect changes to your Python
source code (as ``runserver`` does). It does, however, detect changes to
templates.

.. _unit tests: ../testing/

--addrport [port number or ipaddr:port]
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Use ``--addrport`` to specify a different port, or IP address and port, from
the default of 127.0.0.1:8000. This value follows exactly the same format and
serves exactly the same function as the argument to the ``runserver`` subcommand.

Examples:

To run the test server on port 7000 with ``fixture1`` and ``fixture2``::

django-admin.py testserver --addrport 7000 fixture1 fixture2
django-admin.py testserver fixture1 fixture2 --addrport 8080

(The above statements are equivalent. We include both of them to demonstrate
that it doesn't matter whether the options come before or after the
``testserver`` command.)

To run on 1.2.3.4:7000 with a `test` fixture::

django-admin.py testserver --addrport 1.2.3.4:7000 test

--verbosity
~~~~~~~~~~~

Expand Down

0 comments on commit fe78237

Please sign in to comment.