From 471c9aee9771da32b942e71c7dcaef97a4c70f1c Mon Sep 17 00:00:00 2001 From: Adrian Holovaty Date: Sat, 26 Mar 2011 17:45:42 +0000 Subject: Fixed #9158 -- Changed django-admin.py help to be printed to stdout instead of stderr, so that it's more easily greppable. Thanks, petr.marhoun@gmail.com git-svn-id: http://code.djangoproject.com/svn/django/trunk@15921 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- tests/regressiontests/admin_scripts/tests.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/regressiontests/admin_scripts/tests.py') diff --git a/tests/regressiontests/admin_scripts/tests.py b/tests/regressiontests/admin_scripts/tests.py index ed4bd356ba..290a3cad7c 100644 --- a/tests/regressiontests/admin_scripts/tests.py +++ b/tests/regressiontests/admin_scripts/tests.py @@ -1113,7 +1113,7 @@ class CommandTypes(AdminScriptTestCase): self.assertOutput(out, "usage: manage.py subcommand [options] [args]") else: self.assertOutput(out, "Usage: manage.py subcommand [options] [args]") - self.assertOutput(err, "Type 'manage.py help ' for help on a specific subcommand.") + self.assertOutput(out, "Type 'manage.py help ' for help on a specific subcommand.") def test_short_help(self): "-h is handled as a short form of --help" @@ -1123,7 +1123,7 @@ class CommandTypes(AdminScriptTestCase): self.assertOutput(out, "usage: manage.py subcommand [options] [args]") else: self.assertOutput(out, "Usage: manage.py subcommand [options] [args]") - self.assertOutput(err, "Type 'manage.py help ' for help on a specific subcommand.") + self.assertOutput(out, "Type 'manage.py help ' for help on a specific subcommand.") def test_specific_help(self): "--help can be used on a specific command" -- cgit v1.3