Skip to content

Commit 86c9324

Browse files
chore(tests): simplify get_platform test
`nest_asyncio` is archived and broken on some platforms so it's not worth keeping in our test suite.
1 parent 80d5f3b commit 86c9324

File tree

3 files changed

+6
-49
lines changed

3 files changed

+6
-49
lines changed

pyproject.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ dev-dependencies = [
5757
"dirty-equals>=0.6.0",
5858
"importlib-metadata>=6.7.0",
5959
"rich>=13.7.1",
60-
"nest_asyncio==1.6.0",
6160
"pytest-xdist>=3.6.1",
6261
]
6362

requirements-dev.lock

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ multidict==6.4.4
7979
mypy==1.14.1
8080
mypy-extensions==1.0.0
8181
# via mypy
82-
nest-asyncio==1.6.0
8382
nodeenv==1.8.0
8483
# via pyright
8584
nox==2023.4.22

tests/test_client.py

Lines changed: 6 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,10 @@
66
import os
77
import sys
88
import json
9-
import time
109
import asyncio
1110
import inspect
12-
import subprocess
1311
import tracemalloc
1412
from typing import Any, Union, cast
15-
from textwrap import dedent
1613
from unittest import mock
1714
from typing_extensions import Literal
1815

@@ -23,14 +20,17 @@
2320

2421
from imagekit import ImageKit, AsyncImageKit, APIResponseValidationError
2522
from imagekit._types import Omit
23+
from imagekit._utils import asyncify
2624
from imagekit._models import BaseModel, FinalRequestOptions
2725
from imagekit._exceptions import ImageKitError, APIStatusError, APITimeoutError, APIResponseValidationError
2826
from imagekit._base_client import (
2927
DEFAULT_TIMEOUT,
3028
HTTPX_DEFAULT_TIMEOUT,
3129
BaseClient,
30+
OtherPlatform,
3231
DefaultHttpxClient,
3332
DefaultAsyncHttpxClient,
33+
get_platform,
3434
make_request_options,
3535
)
3636

@@ -1808,50 +1808,9 @@ def retry_handler(_request: httpx.Request) -> httpx.Response:
18081808

18091809
assert response.http_request.headers.get("x-stainless-retry-count") == "42"
18101810

1811-
def test_get_platform(self) -> None:
1812-
# A previous implementation of asyncify could leave threads unterminated when
1813-
# used with nest_asyncio.
1814-
#
1815-
# Since nest_asyncio.apply() is global and cannot be un-applied, this
1816-
# test is run in a separate process to avoid affecting other tests.
1817-
test_code = dedent("""
1818-
import asyncio
1819-
import nest_asyncio
1820-
import threading
1821-
1822-
from imagekit._utils import asyncify
1823-
from imagekit._base_client import get_platform
1824-
1825-
async def test_main() -> None:
1826-
result = await asyncify(get_platform)()
1827-
print(result)
1828-
for thread in threading.enumerate():
1829-
print(thread.name)
1830-
1831-
nest_asyncio.apply()
1832-
asyncio.run(test_main())
1833-
""")
1834-
with subprocess.Popen(
1835-
[sys.executable, "-c", test_code],
1836-
text=True,
1837-
) as process:
1838-
timeout = 10 # seconds
1839-
1840-
start_time = time.monotonic()
1841-
while True:
1842-
return_code = process.poll()
1843-
if return_code is not None:
1844-
if return_code != 0:
1845-
raise AssertionError("calling get_platform using asyncify resulted in a non-zero exit code")
1846-
1847-
# success
1848-
break
1849-
1850-
if time.monotonic() - start_time > timeout:
1851-
process.kill()
1852-
raise AssertionError("calling get_platform using asyncify resulted in a hung process")
1853-
1854-
time.sleep(0.1)
1811+
async def test_get_platform(self) -> None:
1812+
platform = await asyncify(get_platform)()
1813+
assert isinstance(platform, (str, OtherPlatform))
18551814

18561815
async def test_proxy_environment_variables(self, monkeypatch: pytest.MonkeyPatch) -> None:
18571816
# Test that the proxy environment variables are set correctly

0 commit comments

Comments
 (0)