From e31f69ff4a165051dd74433ddedc600633f8e4c3 Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Thu, 27 Aug 2020 00:08:23 +0200 Subject: [PATCH] fix windows tests failing due to tornado bug --- mitmproxy/__init__.py | 1 + test/mitmproxy/tools/web/test_app.py | 23 ++++++++++++++++------- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/mitmproxy/__init__.py b/mitmproxy/__init__.py index e930cf1e4..9deef9605 100644 --- a/mitmproxy/__init__.py +++ b/mitmproxy/__init__.py @@ -5,4 +5,5 @@ if sys.platform == 'win32': # workaround for # https://github.com/tornadoweb/tornado/issues/2751 # https://www.tornadoweb.org/en/stable/index.html#installation + # (copied multiple times in the codebase, please remove all occurrences) asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy()) diff --git a/test/mitmproxy/tools/web/test_app.py b/test/mitmproxy/tools/web/test_app.py index 668d3c07d..2cd34af20 100644 --- a/test/mitmproxy/tools/web/test_app.py +++ b/test/mitmproxy/tools/web/test_app.py @@ -3,16 +3,25 @@ import logging from unittest import mock import os import asyncio +import sys import pytest -import tornado.testing -from tornado import httpclient -from tornado import websocket -from mitmproxy import options -from mitmproxy.test import tflow -from mitmproxy.tools.web import app -from mitmproxy.tools.web import master as webmaster +if sys.platform == 'win32': + # workaround for + # https://github.com/tornadoweb/tornado/issues/2751 + # https://www.tornadoweb.org/en/stable/index.html#installation + # (copied multiple times in the codebase, please remove all occurrences) + asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy()) + +import tornado.testing # noqa +from tornado import httpclient # noqa +from tornado import websocket # noqa + +from mitmproxy import options # noqa +from mitmproxy.test import tflow # noqa +from mitmproxy.tools.web import app # noqa +from mitmproxy.tools.web import master as webmaster # noqa @pytest.fixture(scope="module")