Add isort to linting toolchain

[etc/vim.git] / tests / test_blackd.py

diff --git a/tests/test_blackd.py b/tests/test_blackd.py
index cc750b40567d7c4c0f393a272780f41115162b4e..75d756705be7847a4371e9c09c3c0fc088e5101a 100644 (file)
--- a/tests/test_blackd.py
+++ b/tests/test_blackd.py
@@ -1,4 +1,5 @@
 import re
 import re

+from typing import Any

 from unittest.mock import patch
 
 from click.testing import CliRunner
 from unittest.mock import patch
 
 from click.testing import CliRunner


@@ -8,12 +9,18 @@ from tests.util import read_data, DETERMINISTIC_HEADER
 
 try:
     import blackd
 
 try:
     import blackd

-    from aiohttp.test_utils import AioHTTPTestCase, unittest_run_loop
+    from aiohttp.test_utils import AioHTTPTestCase

     from aiohttp import web
     from aiohttp import web

+except ImportError as e:
+    raise RuntimeError("Please install Black with the 'd' extra") from e
+
+try:
+    from aiohttp.test_utils import unittest_run_loop

 except ImportError:
 except ImportError:

-    has_blackd_deps = False
-else:
-    has_blackd_deps = True
+    # unittest_run_loop is unnecessary and a no-op since aiohttp 3.8, and aiohttp 4
+    # removed it. To maintain compatibility we can make our own no-op decorator.
+    def unittest_run_loop(func: Any, *args: Any, **kwargs: Any) -> Any:
+        return func

 
 
 @pytest.mark.blackd
 
 
 @pytest.mark.blackd


@@ -77,6 +84,9 @@ class BlackDTestCase(AioHTTPTestCase):
         await check("ruby3.5")
         await check("pyi3.6")
         await check("py1.5")
         await check("ruby3.5")
         await check("pyi3.6")
         await check("py1.5")

+        await check("2")
+        await check("2.7")
+        await check("py2.7")

         await check("2.8")
         await check("py2.8")
         await check("3.0")
         await check("2.8")
         await check("py2.8")
         await check("3.0")


@@ -85,7 +95,7 @@ class BlackDTestCase(AioHTTPTestCase):
 
     @unittest_run_loop
     async def test_blackd_pyi(self) -> None:
 
     @unittest_run_loop
     async def test_blackd_pyi(self) -> None:

-        source, expected = read_data("stub.pyi")
+        source, expected = read_data("miscellaneous", "stub.pyi")

         response = await self.client.post(
             "/", data=source, headers={blackd.PYTHON_VARIANT_HEADER: "pyi"}
         )
         response = await self.client.post(
             "/", data=source, headers={blackd.PYTHON_VARIANT_HEADER: "pyi"}
         )


@@ -98,8 +108,8 @@ class BlackDTestCase(AioHTTPTestCase):
             r"(In|Out)\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d\.\d\d\d\d\d\d \+\d\d\d\d"
         )
 
             r"(In|Out)\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d\.\d\d\d\d\d\d \+\d\d\d\d"
         )
 

-        source, _ = read_data("blackd_diff.py")
-        expected, _ = read_data("blackd_diff.diff")
+        source, _ = read_data("miscellaneous", "blackd_diff")
+        expected, _ = read_data("miscellaneous", "blackd_diff.diff")

 
         response = await self.client.post(
             "/", data=source, headers={blackd.DIFF_HEADER: "true"}
 
         response = await self.client.post(
             "/", data=source, headers={blackd.DIFF_HEADER: "true"}


@@ -137,10 +147,6 @@ class BlackDTestCase(AioHTTPTestCase):
         await check("py36,py37", 200)
         await check("36", 200)
         await check("3.6.4", 200)
         await check("py36,py37", 200)
         await check("36", 200)
         await check("3.6.4", 200)

-
-        await check("2", 204)
-        await check("2.7", 204)
-        await check("py2.7", 204)

         await check("3.4", 204)
         await check("py3.4", 204)
         await check("py34,py36", 204)
         await check("3.4", 204)
         await check("py3.4", 204)
         await check("py34,py36", 204)