From 426b63ba04521b8eaffb129b7e4feca36eed8777 Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Fri, 3 Apr 2015 11:26:20 +0200 Subject: [PATCH] Fixed #24571 -- Restored testserver positional arguments parsing Thanks Domas Lapinskas for the report and Tim Graham for the review. --- django/core/management/commands/testserver.py | 1 - docs/releases/1.8.1.txt | 3 +++ tests/admin_scripts/tests.py | 15 +++++++++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/django/core/management/commands/testserver.py b/django/core/management/commands/testserver.py index 54e63b97e2..a629e7285a 100644 --- a/django/core/management/commands/testserver.py +++ b/django/core/management/commands/testserver.py @@ -5,7 +5,6 @@ from django.db import connection class Command(BaseCommand): help = 'Runs a development server with data from the given fixture(s).' - args = '[fixture ...]' requires_system_checks = False diff --git a/docs/releases/1.8.1.txt b/docs/releases/1.8.1.txt index 1dff617063..61c506b10a 100644 --- a/docs/releases/1.8.1.txt +++ b/docs/releases/1.8.1.txt @@ -11,3 +11,6 @@ Bugfixes * Added support for serializing :class:`~datetime.timedelta` objects in migrations (:ticket:`24566`). + +* Restored proper parsing of the :djadmin:`testserver` command's positional + arguments (fixture names) (:ticket:`24571`). diff --git a/tests/admin_scripts/tests.py b/tests/admin_scripts/tests.py index e5c49f0144..fbf28ad4f2 100644 --- a/tests/admin_scripts/tests.py +++ b/tests/admin_scripts/tests.py @@ -1315,6 +1315,21 @@ class ManageRunserverEmptyAllowedHosts(AdminScriptTestCase): self.assertOutput(err, 'CommandError: You must set settings.ALLOWED_HOSTS if DEBUG is False.') +class ManageTestserver(AdminScriptTestCase): + from django.core.management.commands.testserver import Command as TestserverCommand + + @mock.patch.object(TestserverCommand, 'handle') + def test_testserver_handle_params(self, mock_handle): + out = StringIO() + call_command('testserver', 'blah.json', stdout=out) + mock_handle.assert_called_with( + 'blah.json', + stdout=out, settings=None, pythonpath=None, verbosity=1, + traceback=False, addrport='', no_color=False, use_ipv6=False, + skip_checks=True, interactive=True, + ) + + ########################################################################## # COMMAND PROCESSING TESTS # Check that user-space commands are correctly handled - in particular,