Merge remote-tracking branch 'core/master' into schema-alteration

Conflicts:
	django/db/models/loading.py

1 files changed, 22 insertions, 0 deletions

diff --git a/tests/admin_scripts/tests.py b/tests/admin_scripts/tests.py
index 9e6b1f557b..2f399acb23 100644
--- a/tests/admin_scripts/tests.py
+++ b/tests/admin_scripts/tests.py
@@ -1192,6 +1192,21 @@ class ManageRunserver(AdminScriptTestCase):
         self.cmd.handle(addrport="deadbeef:7654")
         self.assertServerSettings('deadbeef', '7654')
 
+class ManageRunserverEmptyAllowedHosts(AdminScriptTestCase):
+    def setUp(self):
+        self.write_settings('settings.py', sdict={
+            'ALLOWED_HOSTS': [],
+            'DEBUG': False,
+        })
+
+    def tearDown(self):
+        self.remove_settings('settings.py')
+
+    def test_empty_allowed_hosts_error(self):
+        out, err = self.run_manage(['runserver'])
+        self.assertNoOutput(out)
+        self.assertOutput(err, 'CommandError: You must set settings.ALLOWED_HOSTS if DEBUG is False.')
+
 
 ##########################################################################
 # COMMAND PROCESSING TESTS
@@ -1459,6 +1474,13 @@ class ArgumentOrder(AdminScriptTestCase):
 
 class StartProject(LiveServerTestCase, AdminScriptTestCase):
 
+    available_apps = [
+        'admin_scripts',
+        'django.contrib.auth',
+        'django.contrib.contenttypes',
+        'django.contrib.sessions',
+    ]
+
     def test_wrong_args(self):
         "Make sure passing the wrong kinds of arguments raises a CommandError"
         out, err = self.run_django_admin(['startproject'])