summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Bruhin <me@the-compiler.org>2020-11-10 18:55:44 +0100
committerFlorian Bruhin <me@the-compiler.org>2020-11-25 18:02:34 +0100
commitc8c07da10b08e4d9ce15d67769152b1f978d6bf9 (patch)
tree08d9b260b771a3a99e9f2dfa846ee8f928d0fbf2
parentd709f721a55d8b106623a6b84c5d928c3d08bb2a (diff)
downloadqutebrowser-c8c07da10b08e4d9ce15d67769152b1f978d6bf9.tar.gz
qutebrowser-c8c07da10b08e4d9ce15d67769152b1f978d6bf9.zip
tests: Remove custom signal handler in webserver_sub
This perhaps was required when originally added in 3466ee03f60d1f949a9e40271854806987e6a260, but doesn't seem to be needed nowadays anymore. With cheroot 8.4.4+, it seems to break terminating of the subprocess, see https://github.com/cherrypy/cheroot/issues/328. (cherry picked from commit a39d2d419d9a9d5a00c8b9ca815092801f99fadc)
-rw-r--r--tests/end2end/fixtures/webserver_sub.py8
1 files changed, 1 insertions, 7 deletions
diff --git a/tests/end2end/fixtures/webserver_sub.py b/tests/end2end/fixtures/webserver_sub.py
index 9902ab125..11f07be1e 100644
--- a/tests/end2end/fixtures/webserver_sub.py
+++ b/tests/end2end/fixtures/webserver_sub.py
@@ -327,13 +327,7 @@ def main():
app.template_folder = os.path.join(basedir, 'end2end', 'templates')
port = int(sys.argv[1])
server = WSGIServer(('127.0.0.1', port), app)
-
- signal.signal(signal.SIGTERM, lambda *args: server.stop())
-
- try:
- server.start()
- except KeyboardInterrupt:
- server.stop()
+ server.start()
if __name__ == '__main__':