From 6655793e6abdb6e0bbd016cff58236c89715f577 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Tue, 12 Dec 2017 09:33:34 +0100 Subject: [PATCH] Use 'terminate' to clean up webserver subprocess We already have TestProcess.terminate which does exactly the same WebserverProcess.cleanup does. See #3384 --- tests/end2end/fixtures/webserver.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/tests/end2end/fixtures/webserver.py b/tests/end2end/fixtures/webserver.py index 85a6af070..a40c62015 100644 --- a/tests/end2end/fixtures/webserver.py +++ b/tests/end2end/fixtures/webserver.py @@ -172,11 +172,6 @@ class WebserverProcess(testprocess.Process): def _default_args(self): return [str(self.port)] - def cleanup(self): - """Clean up and shut down the process.""" - self.proc.terminate() - self.proc.waitForFinished() - @pytest.fixture(scope='session', autouse=True) def server(qapp): @@ -184,7 +179,7 @@ def server(qapp): server = WebserverProcess('webserver_sub') server.start() yield server - server.cleanup() + server.terminate() @pytest.fixture(autouse=True) @@ -208,4 +203,4 @@ def ssl_server(request, qapp): server.start() yield server server.after_test() - server.cleanup() + server.terminate()