From 953a471a21444be9bcbc60537853c058d2b23314 Mon Sep 17 00:00:00 2001
From: Ramiro Morales <cramm0@gmail.com>
Date: Thu, 29 Dec 2011 01:18:30 +0000
Subject: [PATCH] Made sure `manage.py help test` works.

Thanks shige DOT abe AT nasa DOT gov for the report.

Fixes #17477. Refs r16352.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17284 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 django/core/management/commands/test.py    |  5 ++++-
 tests/regressiontests/test_runner/tests.py | 14 ++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/django/core/management/commands/test.py b/django/core/management/commands/test.py
index ad49184e8a..48b330aa6d 100644
--- a/django/core/management/commands/test.py
+++ b/django/core/management/commands/test.py
@@ -31,13 +31,16 @@ class Command(BaseCommand):
 
     requires_model_validation = False
 
+    def __init__(self):
+        self.test_runner = None
+        super(Command, self).__init__()
+
     def run_from_argv(self, argv):
         """
         Pre-parse the command line to extract the value of the --testrunner
         option. This allows a test runner to define additional command line
         arguments.
         """
-        self.test_runner = None
         option = '--testrunner='
         for arg in argv[2:]:
             if arg.startswith(option):
diff --git a/tests/regressiontests/test_runner/tests.py b/tests/regressiontests/test_runner/tests.py
index 4e2555ee2e..d19df3c725 100644
--- a/tests/regressiontests/test_runner/tests.py
+++ b/tests/regressiontests/test_runner/tests.py
@@ -214,6 +214,20 @@ class CustomTestRunnerOptionsTests(AdminScriptTestCase):
         self.assertOutput(out, 'bar:foo:31337')
 
 
+class Ticket17477RegressionTests(AdminScriptTestCase):
+    def setUp(self):
+        self.write_settings('settings.py')
+
+    def tearDown(self):
+        self.remove_settings('settings.py')
+
+    def test_ticket_17477(self):
+        """'manage.py help test' works after r16352."""
+        args = ['help', 'test']
+        out, err = self.run_manage(args)
+        self.assertNoOutput(err)
+
+
 class ModulesTestsPackages(unittest.TestCase):
     def test_get_tests(self):
         "Check that the get_tests helper function can find tests in a directory"