Commit 6b5eb7d4 authored by Zsolt Dollenstein's avatar Zsolt Dollenstein
Browse files

skip tests touching aiohttp when known exception occurs

parent 720dd415
Loading
Loading
Loading
Loading
+0 −4
Changes for .travis.yml: 0 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -33,10 +33,6 @@ matrix:
      python: 3.7
    - name: "3.8-dev"
      python: 3.8-dev
  # aiohttp currently has a bug affecting 3.8
  allow_failures:
    - name: "3.8-dev"
      python: 3.8-dev
before_deploy:
  - pip install pyinstaller
  - pyinstaller --clean -F --add-data blib2to3/:blib2to3 black.py
+21 −0
Changes for tests/test_black.py: 21 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -111,6 +111,15 @@ def wrapper(*args: Any, **kwargs: Any) -> None:
    return wrapper


@contextmanager
def skip_if_exception(e: str) -> Iterator[None]:
    try:
        yield
    except Exception as exc:
        if exc.__class__.__name__ == e:
            unittest.skip(f"Encountered expected exception {exc}, skipping")


class BlackRunner(CliRunner):
    """Modify CliRunner so that stderr is not merged with stdout.

@@ -1514,6 +1523,9 @@ def fail(*args: Any, **kwargs: Any) -> None:
        ):
            ff(THIS_FILE)

    # TODO: remove these decorators once the below is released
    # https://github.com/aio-libs/aiohttp/commit/bfb99eb92bbc4a7462bc51dda3e480feed43882d
    @skip_if_exception("ClientOSError")
    @unittest.skipUnless(has_blackd_deps, "blackd's dependencies are not installed")
    @async_test
    async def test_blackd_request_needs_formatting(self) -> None:
@@ -1524,6 +1536,7 @@ async def test_blackd_request_needs_formatting(self) -> None:
            self.assertEqual(response.charset, "utf8")
            self.assertEqual(await response.read(), b'print("hello world")\n')

    @skip_if_exception("ClientOSError")
    @unittest.skipUnless(has_blackd_deps, "blackd's dependencies are not installed")
    @async_test
    async def test_blackd_request_no_change(self) -> None:
@@ -1533,6 +1546,7 @@ async def test_blackd_request_no_change(self) -> None:
            self.assertEqual(response.status, 204)
            self.assertEqual(await response.read(), b"")

    @skip_if_exception("ClientOSError")
    @unittest.skipUnless(has_blackd_deps, "blackd's dependencies are not installed")
    @async_test
    async def test_blackd_request_syntax_error(self) -> None:
@@ -1546,6 +1560,7 @@ async def test_blackd_request_syntax_error(self) -> None:
                msg=f"Expected error to start with 'Cannot parse', got {repr(content)}",
            )

    @skip_if_exception("ClientOSError")
    @unittest.skipUnless(has_blackd_deps, "blackd's dependencies are not installed")
    @async_test
    async def test_blackd_unsupported_version(self) -> None:
@@ -1556,6 +1571,7 @@ async def test_blackd_unsupported_version(self) -> None:
            )
            self.assertEqual(response.status, 501)

    @skip_if_exception("ClientOSError")
    @unittest.skipUnless(has_blackd_deps, "blackd's dependencies are not installed")
    @async_test
    async def test_blackd_supported_version(self) -> None:
@@ -1566,6 +1582,7 @@ async def test_blackd_supported_version(self) -> None:
            )
            self.assertEqual(response.status, 200)

    @skip_if_exception("ClientOSError")
    @unittest.skipUnless(has_blackd_deps, "blackd's dependencies are not installed")
    @async_test
    async def test_blackd_invalid_python_variant(self) -> None:
@@ -1590,6 +1607,7 @@ async def check(header_value: str, expected_status: int = 400) -> None:
            await check("pypy3.0")
            await check("jython3.4")

    @skip_if_exception("ClientOSError")
    @unittest.skipUnless(has_blackd_deps, "blackd's dependencies are not installed")
    @async_test
    async def test_blackd_pyi(self) -> None:
@@ -1602,6 +1620,7 @@ async def test_blackd_pyi(self) -> None:
            self.assertEqual(response.status, 200)
            self.assertEqual(await response.text(), expected)

    @skip_if_exception("ClientOSError")
    @unittest.skipUnless(has_blackd_deps, "blackd's dependencies are not installed")
    @async_test
    async def test_blackd_python_variant(self) -> None:
@@ -1634,6 +1653,7 @@ async def check(header_value: str, expected_status: int) -> None:
            await check("3.4", 204)
            await check("py3.4", 204)

    @skip_if_exception("ClientOSError")
    @unittest.skipUnless(has_blackd_deps, "blackd's dependencies are not installed")
    @async_test
    async def test_blackd_line_length(self) -> None:
@@ -1644,6 +1664,7 @@ async def test_blackd_line_length(self) -> None:
            )
            self.assertEqual(response.status, 200)

    @skip_if_exception("ClientOSError")
    @unittest.skipUnless(has_blackd_deps, "blackd's dependencies are not installed")
    @async_test
    async def test_blackd_invalid_line_length(self) -> None: