tests: Add second server fixture

Can be used to e.g. test cross-origin requests

2 files changed, 15 insertions, 1 deletions

diff --git a/tests/end2end/conftest.py b/tests/end2end/conftest.py
index 11066fb92..17b457521 100644
--- a/tests/end2end/conftest.py
+++ b/tests/end2end/conftest.py
@@ -35,7 +35,7 @@ from PyQt5.QtCore import PYQT_VERSION, QCoreApplication
 
 pytest.register_assert_rewrite('end2end.fixtures')
 
-from end2end.fixtures.webserver import server, server_per_test, ssl_server
+from end2end.fixtures.webserver import server, server_per_test, server2, ssl_server
 from end2end.fixtures.quteprocess import (quteproc_process, quteproc,
                                           quteproc_new)
 from end2end.fixtures.testprocess import pytest_runtest_makereport
diff --git a/tests/end2end/fixtures/webserver.py b/tests/end2end/fixtures/webserver.py
index 27ddff722..d40739724 100644
--- a/tests/end2end/fixtures/webserver.py
+++ b/tests/end2end/fixtures/webserver.py
@@ -202,6 +202,20 @@ def server_per_test(server, request):
 
 
 @pytest.fixture
+def server2(qapp, request):
+    """Fixture for a second server object for cross-origin tests."""
+    server = WebserverProcess(request, 'webserver_sub')
+
+    if not hasattr(request.node, '_server_logs'):
+        request.node._server_logs = []
+    request.node._server_logs.append(('secondary server', server.captured_log))
+
+    server.start()
+    yield server
+    server.terminate()
+
+
+@pytest.fixture
 def ssl_server(request, qapp):
     """Fixture for a webserver with a self-signed SSL certificate.