From fe5738119a20423cbf24fef445fcfae505b9b967 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Wed, 27 Jan 2021 18:47:44 +0100 Subject: tests: Use different workaround for mimetypes issue --- tests/end2end/fixtures/webserver_sub.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/end2end/fixtures/webserver_sub.py b/tests/end2end/fixtures/webserver_sub.py index b02c605d1..b7999148f 100644 --- a/tests/end2end/fixtures/webserver_sub.py +++ b/tests/end2end/fixtures/webserver_sub.py @@ -30,6 +30,7 @@ import sys import json import time import threading +import mimetypes import pathlib from http import HTTPStatus @@ -60,12 +61,6 @@ def send_data(path): data_dir = END2END_DIR / 'data' if (data_dir / path).is_dir(): path += '/index.html' - - if path == 'service-worker/worker.js': - # For some reason, Flask returns this with a text/plain mimetype on GitHub - # Actions with Windows?! - flask.send_file(path, mimetype='text/javascript') - return flask.send_from_directory(data_dir, path) @@ -330,6 +325,11 @@ def main(): app.template_folder = END2END_DIR / 'templates' assert app.template_folder.is_dir(), app.template_folder + if mimetypes.guess_type('worker.js')[0] == 'text/plain': + # WORKAROUND for https://github.com/pallets/flask/issues/1045 + # Needed for Windows on GitHub Actions for some reason... + mimetypes.add_type('application/javascript', '.js') + port = int(sys.argv[1]) server = WSGIServer(('127.0.0.1', port), app) server.start() -- cgit v1.2.3-54-g00ecf