Django 1.11 live server updates (#378)

* Do not pass specified port to Django 1.11 live server.

* Raise a warning when trying to specify a live server port with Django
1.11.

* Setup ALLOWED_HOSTS for live server.

Author: pelme

pytest_django/fixtures.py

@@ -285,11 +285,23 @@ def live_server(request):
           ``django.contrib.staticfiles`` is available in INSTALLED_APPS.
     """
     skip_if_no_django()
-    addr = request.config.getvalue('liveserver')
-    if not addr:
-        addr = os.getenv('DJANGO_LIVE_TEST_SERVER_ADDRESS')
+
+    import django
+
+    addr = (request.config.getvalue('liveserver') or
+            os.getenv('DJANGO_LIVE_TEST_SERVER_ADDRESS'))
+
+    if addr and django.VERSION >= (1, 11) and ':' in addr:
+        request.config.warn('D001', 'Specifying a live server port is not supported '
+                            'in Django 1.11. This will be an error in a future '
+                            'pytest-django release.')
+
     if not addr:
-        addr = 'localhost:8081,8100-8200'
+        if django.VERSION < (1, 11):
+            addr = 'localhost:8081,8100-8200'
+        else:
+            addr = 'localhost'
+
     server = live_server_helper.LiveServer(addr)
     request.addfinalizer(server.stop)
     return server

pytest_django/live_server_helper.py

@@ -10,8 +10,10 @@ class LiveServer(object):
     """
 
     def __init__(self, addr):
+        import django
         from django.db import connections
         from django.test.testcases import LiveServerThread
+        from django.test.utils import modify_settings
 
         connections_override = {}
         for conn in connections.all():
@@ -32,9 +34,19 @@ def __init__(self, addr):
             from django.test.testcases import _StaticFilesHandler
             liveserver_kwargs['static_handler'] = _StaticFilesHandler
 
-        host, possible_ports = parse_addr(addr)
-        self.thread = LiveServerThread(host, possible_ports,
-                                       **liveserver_kwargs)
+        if django.VERSION < (1, 11):
+            host, possible_ports = parse_addr(addr)
+            self.thread = LiveServerThread(host, possible_ports,
+                                           **liveserver_kwargs)
+        else:
+            host = addr
+            self.thread = LiveServerThread(host, **liveserver_kwargs)
+
+        self._live_server_modified_settings = modify_settings(
+            ALLOWED_HOSTS={'append': host},
+        )
+        self._live_server_modified_settings.enable()
+
         self.thread.daemon = True
         self.thread.start()
         self.thread.is_ready.wait()
@@ -48,6 +60,7 @@ def stop(self):
         terminate = getattr(self.thread, 'terminate', lambda: None)
         terminate()
         self.thread.join()
+        self._live_server_modified_settings.disable()
 
     @property
     def url(self):

tests/test_fixtures.py

@@ -187,6 +187,20 @@ def test_serve_static_dj17_without_staticfiles_app(self, live_server,
         with pytest.raises(HTTPError):
             urlopen(live_server + '/static/a_file.txt').read()
 
+    @pytest.mark.skipif(get_django_version() < (1, 11),
+                        reason='Django >= 1.11 required')
+    def test_specified_port_error_message_django_111(self, django_testdir):
+        django_testdir.create_test_module("""
+        def test_with_live_server(live_server):
+            pass
+        """)
+
+        result = django_testdir.runpytest_subprocess('--liveserver=localhost:1234')
+        result.stdout.fnmatch_lines([
+            '*Specifying a live server port is not supported in Django 1.11. This '
+            'will be an error in a future pytest-django release.*'
+        ])
+
 
 @pytest.mark.django_project(extra_settings="""
     AUTH_USER_MODEL = 'app.MyCustomUser'