summaryrefslogtreecommitdiff
path: root/django/test/utils.py
diff options
context:
space:
mode:
authorChris Lamb <chris@chris-lamb.co.uk>2017-02-25 02:58:56 +0800
committerTim Graham <timograham@gmail.com>2017-02-24 13:58:56 -0500
commit339d526d55baffea3bd3cecd0e07ddf644028e8c (patch)
tree365441f9e3bf8b81e35a428c1c33809c86b1234b /django/test/utils.py
parentdc811cf50306972f838af8a975848ec26548bbf8 (diff)
downloaddjango-339d526d55baffea3bd3cecd0e07ddf644028e8c.tar.gz
Fixed #27873 -- Fixed crash in setup_test_environment() if ALLOWED_HOSTS is a tuple.
Regression in 17e661641ddaf8266e7430d83cfb2039abc55df7
Diffstat (limited to 'django/test/utils.py')
-rw-r--r--django/test/utils.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/test/utils.py b/django/test/utils.py
index 5c374c2292..88158e89d6 100644
--- a/django/test/utils.py
+++ b/django/test/utils.py
@@ -124,7 +124,7 @@ def setup_test_environment(debug=None):
saved_data.allowed_hosts = settings.ALLOWED_HOSTS
# Add the default host of the test client.
- settings.ALLOWED_HOSTS = settings.ALLOWED_HOSTS + ['testserver']
+ settings.ALLOWED_HOSTS = list(settings.ALLOWED_HOSTS) + ['testserver']
saved_data.debug = settings.DEBUG
settings.DEBUG = debug