chore: remove pytest-tornado dependency (#37)

* chore: remove pytest-tornado dependency

It is no longer maintained and was not providing much utility anyway.

* remove auto-merge action

It is currently broken. It can be added back once it is fixed.

Author: fdintino

.github/workflows/dependabot-auto-merge-caller.yaml

@@ -28,6 +28,7 @@ exclude_lines =
 [tool:pytest]
 python_files = tests.py test_*.py *_test.py
 norecursedirs = *.egg .eggs dist build docs .tox .git __pycache__
+asyncio_default_fixture_loop_scope = function
 filterwarnings =
   ignore:@return_future is deprecated:DeprecationWarning
   ignore:@asynchronous is deprecated:DeprecationWarning

setup.cfg

@@ -1,5 +1,12 @@
+import asyncio
 import os
+
 import pytest
+import pytest_asyncio
+
+import tornado.httpclient
+import tornado.httpserver
+import tornado.testing
 
 from thumbor.config import Config
 from thumbor.context import Context, ServerParameters, RequestParameters
@@ -11,6 +18,11 @@
 except ImportError:
     from thumbor.utils import which
 
+try:
+    from thumbor.context import ThreadPool
+except ImportError:  # pragma: no cover
+    ThreadPool = None
+
 try:
     from tests.mock_aio_server import s3_server, s3_client, session  # noqa
 except:  # noqa
@@ -27,6 +39,18 @@ def s3_client():
 CURR_DIR = os.path.abspath(os.path.dirname(__file__))
 
 
+@pytest.fixture(autouse=True)
+def reset_thumbor_threadpool():
+    """thumbor's ThreadPool is a process-wide singleton that can otherwise
+    hold a reference to a previous test's (now closed) event loop."""
+    if ThreadPool is not None and getattr(ThreadPool, "_instance", None):
+        for thread_pool in ThreadPool._instance.values():
+            thread_pool.cleanup()
+    yield
+    if ThreadPool is not None:
+        ThreadPool._instance = None
+
+
 @pytest.fixture
 def storage_path():
     return os.path.join(CURR_DIR, "data")
@@ -89,3 +113,35 @@ def context(config):
 @pytest.fixture
 def app(context):
     return get_application(context)
+
+
+@pytest.fixture
+def _unused_port():
+    return tornado.testing.bind_unused_port()
+
+
+@pytest.fixture
+def http_port(_unused_port):
+    return _unused_port[1]
+
+
+@pytest.fixture
+def base_url(http_port):
+    return "http://localhost:%d" % http_port
+
+
+@pytest_asyncio.fixture
+async def http_server(app, _unused_port):
+    server = tornado.httpserver.HTTPServer(app)
+    server.add_socket(_unused_port[0])
+    await asyncio.sleep(0)
+    yield server
+    server.stop()
+    await server.close_all_connections()
+
+
+@pytest_asyncio.fixture
+async def http_client(http_server):
+    client = tornado.httpclient.AsyncHTTPClient()
+    yield client
+    client.close()

tests/conftest.py

@@ -6,18 +6,18 @@
 VIDEO_HEADERS = {"Accept": 'video/*,*/*;q=0.8'}
 
 
-@pytest.mark.gen_test
+@pytest.mark.asyncio
 @pytest.mark.parametrize('accepts_video', (True, False))
 @pytest.mark.parametrize('setting_key,setting_val,format_box', [
     ('FFMPEG_GIF_AUTO_H264', True, b'avcC'),
     ('FFMPEG_GIF_AUTO_H265', True, b'hvcC'),
     ('FFMPEG_GIF_AUTO_H264', False, None),
 ])
-def test_auto_h26x_transcodes_anim_gif(http_client, base_url, accepts_video,
+async def test_auto_h26x_transcodes_anim_gif(http_client, base_url, accepts_video,
                                        config, setting_key, setting_val, format_box):
     setattr(config, setting_key, setting_val)
 
-    response = yield http_client.fetch("%s/unsafe/hotdog.gif" % base_url,
+    response = await http_client.fetch("%s/unsafe/hotdog.gif" % base_url,
         headers=(VIDEO_HEADERS if accepts_video else {}))
 
     mime_type = 'video/mp4' if accepts_video and setting_val else 'image/gif'

tests/engines/test_anim_gif_auto_mp4.py

@@ -17,14 +17,14 @@ def config(config):
     return config
 
 
-@pytest.mark.gen_test
+@pytest.mark.asyncio
 @pytest.mark.parametrize('accepts_webp', (True, False))
 @pytest.mark.parametrize('ffmpeg_conf_gif_auto_webp', (True, False))
-def test_auto_webp_transcodes_anim_gif(http_client, base_url, accepts_webp,
+async def test_auto_webp_transcodes_anim_gif(http_client, base_url, accepts_webp,
                                        config, ffmpeg_conf_gif_auto_webp):
     config.FFMPEG_GIF_AUTO_WEBP = ffmpeg_conf_gif_auto_webp
 
-    response = yield http_client.fetch("%s/unsafe/hotdog.gif" % base_url,
+    response = await http_client.fetch("%s/unsafe/hotdog.gif" % base_url,
         headers=(WEBP_HEADERS if accepts_webp else {}))
 
     img_format = 'webp' if accepts_webp and ffmpeg_conf_gif_auto_webp else 'gif'

tests/engines/test_anim_gif_auto_webp.py

@@ -27,16 +27,16 @@ def test_source_height(context):
     assert engine.source_height == 150
 
 
-@pytest.mark.gen_test
-def test_error_handling(mocker, http_client, base_url):
+@pytest.mark.asyncio
+async def test_error_handling(mocker, http_client, base_url):
     with pytest.raises(HTTPClientError) as exc_info:
-        yield http_client.fetch("%s/unsafe/corrupt.mp4" % base_url)
+        await http_client.fetch("%s/unsafe/corrupt.mp4" % base_url)
     assert exc_info.value.code == 500
 
 
-@pytest.mark.gen_test
+@pytest.mark.asyncio
 @pytest.mark.parametrize('has_ctx_request', [True, False])
-def test_error_handling_run_cmd(storage_path, mocker, context, has_ctx_request):
+async def test_error_handling_run_cmd(storage_path, mocker, context, has_ctx_request):
     if not has_ctx_request:
         context.request = None
     with open("%s/corrupt.mp4" % storage_path, mode='rb') as f:

tests/engines/test_ffmpeg_engine.py

@@ -13,12 +13,12 @@ def config(config):
     return config
 
 
-@pytest.mark.gen_test
-def test_crop(mocker, http_client, base_url):
+@pytest.mark.asyncio
+async def test_crop(mocker, http_client, base_url):
     mocker.spy(FFmpegEngine, 'crop')
     mocker.spy(FFmpegEngine, 'run_cmd')
 
-    response = yield http_client.fetch("%s/unsafe/50x25:150x125/hotdog.mp4" % base_url)
+    response = await http_client.fetch("%s/unsafe/50x25:150x125/hotdog.mp4" % base_url)
 
     assert response.code == 200
     assert response.headers.get('content-type') == 'video/mp4'
@@ -35,12 +35,12 @@ def test_crop(mocker, http_client, base_url):
     assert (file_info['width'], file_info['height']) == (100, 100)
 
 
-@pytest.mark.gen_test
-def test_flip_horizontally(mocker, http_client, base_url):
+@pytest.mark.asyncio
+async def test_flip_horizontally(mocker, http_client, base_url):
     mocker.spy(FFmpegEngine, 'flip_horizontally')
     mocker.spy(FFmpegEngine, 'run_cmd')
 
-    response = yield http_client.fetch("%s/unsafe/-200x150/hotdog.mp4" % base_url)
+    response = await http_client.fetch("%s/unsafe/-200x150/hotdog.mp4" % base_url)
 
     assert response.code == 200
     assert response.headers.get('content-type') == 'video/mp4'
@@ -57,12 +57,12 @@ def test_flip_horizontally(mocker, http_client, base_url):
     assert (file_info['width'], file_info['height']) == (200, 150)
 
 
-@pytest.mark.gen_test
-def test_flip_vertically(mocker, http_client, base_url):
+@pytest.mark.asyncio
+async def test_flip_vertically(mocker, http_client, base_url):
     mocker.spy(FFmpegEngine, 'flip_vertically')
     mocker.spy(FFmpegEngine, 'run_cmd')
 
-    response = yield http_client.fetch("%s/unsafe/200x-150/hotdog.mp4" % base_url)
+    response = await http_client.fetch("%s/unsafe/200x-150/hotdog.mp4" % base_url)
 
     assert response.code == 200
     assert response.headers.get('content-type') == 'video/mp4'
@@ -79,12 +79,12 @@ def test_flip_vertically(mocker, http_client, base_url):
     assert (file_info['width'], file_info['height']) == (200, 150)
 
 
-@pytest.mark.gen_test
-def test_filter_grayscale(mocker, http_client, base_url):
+@pytest.mark.asyncio
+async def test_filter_grayscale(mocker, http_client, base_url):
     mocker.spy(FFmpegEngine, 'convert_to_grayscale')
     mocker.spy(FFmpegEngine, 'run_cmd')
 
-    response = yield http_client.fetch("%s/unsafe/filters:grayscale()/hotdog.mp4" % base_url)
+    response = await http_client.fetch("%s/unsafe/filters:grayscale()/hotdog.mp4" % base_url)
 
     assert response.code == 200
     assert response.headers.get('content-type') == 'video/mp4'
@@ -101,12 +101,12 @@ def test_filter_grayscale(mocker, http_client, base_url):
     assert (file_info['width'], file_info['height']) == (200, 150)
 
 
-@pytest.mark.gen_test
-def test_filter_rotate(mocker, http_client, base_url):
+@pytest.mark.asyncio
+async def test_filter_rotate(mocker, http_client, base_url):
     mocker.spy(FFmpegEngine, 'rotate')
     mocker.spy(FFmpegEngine, 'run_cmd')
 
-    response = yield http_client.fetch("%s/unsafe/filters:rotate(90)/hotdog.mp4" % base_url)
+    response = await http_client.fetch("%s/unsafe/filters:rotate(90)/hotdog.mp4" % base_url)
 
     assert response.code == 200
     assert response.headers.get('content-type') == 'video/mp4'
@@ -123,14 +123,14 @@ def test_filter_rotate(mocker, http_client, base_url):
     assert (file_info['width'], file_info['height']) == (200, 150)
 
 
-@pytest.mark.gen_test
-def test_reorientate(mocker, config, http_client, base_url):
+@pytest.mark.asyncio
+async def test_reorientate(mocker, config, http_client, base_url):
     config.RESPECT_ORIENTATION = True
 
     mocker.spy(FFmpegEngine, 'reorientate')
     mocker.spy(FFmpegEngine, 'run_cmd')
 
-    response = yield http_client.fetch("%s/unsafe/hotdog.mp4" % base_url)
+    response = await http_client.fetch("%s/unsafe/hotdog.mp4" % base_url)
 
     assert response.code == 200
     assert response.headers.get('content-type') == 'video/mp4'