Add favicon support to test webservers

This avoids getting a 404.

3 files changed, 14 insertions, 1 deletions

diff --git a/tests/end2end/fixtures/webserver.py b/tests/end2end/fixtures/webserver.py
index 54ea441de..183f0800a 100644
--- a/tests/end2end/fixtures/webserver.py
+++ b/tests/end2end/fixtures/webserver.py
@@ -63,7 +63,6 @@ class Request(testprocess.Line):
     def _check_status(self):
         """Check if the http status is what we expected."""
         path_to_statuses = {
-            '/favicon.ico': [HTTPStatus.NOT_FOUND],
             '/does-not-exist': [HTTPStatus.NOT_FOUND],
             '/does-not-exist-2': [HTTPStatus.NOT_FOUND],
             '/404': [HTTPStatus.NOT_FOUND],
diff --git a/tests/end2end/fixtures/webserver_sub.py b/tests/end2end/fixtures/webserver_sub.py
index e34d4c295..9902ab125 100644
--- a/tests/end2end/fixtures/webserver_sub.py
+++ b/tests/end2end/fixtures/webserver_sub.py
@@ -272,6 +272,15 @@ def view_user_agent():
     return flask.jsonify({'user-agent': flask.request.headers['user-agent']})
 
 
+@app.route('/favicon.ico')
+def favicon():
+    basedir = os.path.join(os.path.realpath(os.path.dirname(__file__)),
+                           '..', '..', '..')
+    return flask.send_from_directory(os.path.join(basedir, 'icons'),
+                                     'qutebrowser.ico',
+                                     mimetype='image/vnd.microsoft.icon')
+
+
 @app.after_request
 def log_request(response):
     """Log a webserver request."""
diff --git a/tests/end2end/fixtures/webserver_sub_ssl.py b/tests/end2end/fixtures/webserver_sub_ssl.py
index 7cd6dc92c..d3869201f 100644
--- a/tests/end2end/fixtures/webserver_sub_ssl.py
+++ b/tests/end2end/fixtures/webserver_sub_ssl.py
@@ -40,6 +40,11 @@ def hello_world():
     return "Hello World via SSL!"
 
 
+@app.route('/favicon.ico')
+def favicon():
+    return webserver_sub.favicon()
+
+
 @app.after_request
 def log_request(response):
     return webserver_sub.log_request(response)