diff --git a/django/core/management/__init__.py b/django/core/management/__init__.py index 2b1ce67761..e3bacf4cfa 100644 --- a/django/core/management/__init__.py +++ b/django/core/management/__init__.py @@ -259,6 +259,7 @@ class ManagementUtility: sys.exit(1) elif not settings.configured: sys.stderr.write("No Django settings specified.\n") + sys.exit(1) possible_matches = get_close_matches(subcommand, commands) sys.stderr.write("Unknown command: %r" % subcommand) if possible_matches: diff --git a/tests/admin_scripts/tests.py b/tests/admin_scripts/tests.py index ce835d75a6..3f73290953 100644 --- a/tests/admin_scripts/tests.py +++ b/tests/admin_scripts/tests.py @@ -317,7 +317,6 @@ class DjangoAdminDefaultSettings(AdminScriptTestCase): out, err = self.run_django_admin(args) self.assertNoOutput(out) self.assertOutput(err, "No Django settings specified") - self.assertOutput(err, "Unknown command: 'noargs_command'") def test_custom_command_with_settings(self): """ @@ -417,7 +416,6 @@ class DjangoAdminFullPathDefaultSettings(AdminScriptTestCase): out, err = self.run_django_admin(args) self.assertNoOutput(out) self.assertOutput(err, "No Django settings specified") - self.assertOutput(err, "Unknown command: 'noargs_command'") def test_custom_command_with_settings(self): """ @@ -508,7 +506,6 @@ class DjangoAdminMinimalSettings(AdminScriptTestCase): out, err = self.run_django_admin(args) self.assertNoOutput(out) self.assertOutput(err, "No Django settings specified") - self.assertOutput(err, "Unknown command: 'noargs_command'") def test_custom_command_with_settings(self): """ @@ -600,7 +597,6 @@ class DjangoAdminAlternateSettings(AdminScriptTestCase): out, err = self.run_django_admin(args) self.assertNoOutput(out) self.assertOutput(err, "No Django settings specified") - self.assertOutput(err, "Unknown command: 'noargs_command'") def test_custom_command_with_settings(self): """ @@ -696,7 +692,6 @@ class DjangoAdminMultipleSettings(AdminScriptTestCase): out, err = self.run_django_admin(args) self.assertNoOutput(out) self.assertOutput(err, "No Django settings specified") - self.assertOutput(err, "Unknown command: 'noargs_command'") def test_custom_command_with_settings(self): """ @@ -806,7 +801,6 @@ class DjangoAdminSettingsDirectory(AdminScriptTestCase): out, err = self.run_django_admin(args) self.assertNoOutput(out) self.assertOutput(err, "No Django settings specified") - self.assertOutput(err, "Unknown command: 'noargs_command'") def test_builtin_with_settings(self): """