diff options
| author | Russell Keith-Magee <russell@keith-magee.com> | 2008-08-08 13:40:11 +0000 |
|---|---|---|
| committer | Russell Keith-Magee <russell@keith-magee.com> | 2008-08-08 13:40:11 +0000 |
| commit | 9dfad9925718288bb81dbd6a50001767b6cc123d (patch) | |
| tree | 950a29bacf2b27077fd1c661acd25e7d58f9db9a /tests/regressiontests/admin_scripts/tests.py | |
| parent | 196b2827759da3c80617418cbcdcb51f2d8ce1bc (diff) | |
Fixed #8120, #7997 -- Cleaned up the help messages displayed by django-admin so that the lax options aren't repeated, and the lax options are displayed when no subcommand is provided. Thanks to Scott Moonen <smoonen@andstuff.org> and trevor for the respective reports.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8228 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'tests/regressiontests/admin_scripts/tests.py')
| -rw-r--r-- | tests/regressiontests/admin_scripts/tests.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/regressiontests/admin_scripts/tests.py b/tests/regressiontests/admin_scripts/tests.py index 0c3fc1435e..9061f28d1e 100644 --- a/tests/regressiontests/admin_scripts/tests.py +++ b/tests/regressiontests/admin_scripts/tests.py @@ -894,9 +894,9 @@ class CommandTypes(AdminScriptTestCase): args = ['--help'] out, err = self.run_manage(args) if sys.version_info < (2, 5): - self.assertOutput(out, "usage: manage.py [options]") + self.assertOutput(out, "usage: manage.py subcommand [options] [args]") else: - self.assertOutput(out, "Usage: manage.py [options]") + self.assertOutput(out, "Usage: manage.py subcommand [options] [args]") self.assertOutput(err, "Type 'manage.py help <subcommand>' for help on a specific subcommand.") def test_specific_help(self): |