diff options
| author | Claude Paroz <claude@2xlibre.net> | 2014-05-10 18:40:44 +0200 |
|---|---|---|
| committer | Erik Romijn <eromijn@solidlinks.nl> | 2014-05-16 12:08:31 +0200 |
| commit | f5d4b45df106ad3d37783ef8ea424c030bb6b196 (patch) | |
| tree | 9a79e3939b4abf6747bb96e71d913dc6bb574d19 /tests/admin_scripts | |
| parent | cb15231888df2545356ad307eaea07f36aa0e8e0 (diff) | |
Fixed #21634 -- Prevented hiding ImproperlyConfigured when command not found
Thanks nikolay.v.golub@gmail.com for the report.
Diffstat (limited to 'tests/admin_scripts')
| -rw-r--r-- | tests/admin_scripts/tests.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/admin_scripts/tests.py b/tests/admin_scripts/tests.py index 4c3ee36b66..4f41e876bc 100644 --- a/tests/admin_scripts/tests.py +++ b/tests/admin_scripts/tests.py @@ -275,7 +275,7 @@ class DjangoAdminDefaultSettings(AdminScriptTestCase): args = ['noargs_command'] out, err = self.run_django_admin(args) self.assertNoOutput(out) - self.assertOutput(err, "Unknown command: 'noargs_command'") + self.assertOutput(err, "settings are not configured") def test_custom_command_with_settings(self): "default: django-admin can execute user commands if settings are provided as argument" @@ -342,7 +342,7 @@ class DjangoAdminFullPathDefaultSettings(AdminScriptTestCase): args = ['noargs_command'] out, err = self.run_django_admin(args) self.assertNoOutput(out) - self.assertOutput(err, "Unknown command: 'noargs_command'") + self.assertOutput(err, "settings are not configured") def test_custom_command_with_settings(self): "fulldefault: django-admin can execute user commands if settings are provided as argument" @@ -409,7 +409,7 @@ class DjangoAdminMinimalSettings(AdminScriptTestCase): args = ['noargs_command'] out, err = self.run_django_admin(args) self.assertNoOutput(out) - self.assertOutput(err, "Unknown command: 'noargs_command'") + self.assertOutput(err, "settings are not configured") def test_custom_command_with_settings(self): "minimal: django-admin can't execute user commands, even if settings are provided as argument" @@ -476,7 +476,7 @@ class DjangoAdminAlternateSettings(AdminScriptTestCase): args = ['noargs_command'] out, err = self.run_django_admin(args) self.assertNoOutput(out) - self.assertOutput(err, "Unknown command: 'noargs_command'") + self.assertOutput(err, "settings are not configured") def test_custom_command_with_settings(self): "alternate: django-admin can execute user commands if settings are provided as argument" @@ -546,7 +546,7 @@ class DjangoAdminMultipleSettings(AdminScriptTestCase): args = ['noargs_command'] out, err = self.run_django_admin(args) self.assertNoOutput(out) - self.assertOutput(err, "Unknown command: 'noargs_command'") + self.assertOutput(err, "settings are not configured") def test_custom_command_with_settings(self): "alternate: django-admin can execute user commands if settings are provided as argument" @@ -620,7 +620,7 @@ class DjangoAdminSettingsDirectory(AdminScriptTestCase): args = ['noargs_command'] out, err = self.run_django_admin(args) self.assertNoOutput(out) - self.assertOutput(err, "Unknown command: 'noargs_command'") + self.assertOutput(err, "settings are not configured") def test_builtin_with_settings(self): "directory: django-admin builtin commands succeed if settings are provided as argument" |