Skip to content

Commit 13e718b

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 05aeaa7 commit 13e718b

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
@@ -56,7 +56,6 @@ dev-dependencies = [
5656
"dirty-equals>=0.6.0",
5757
"importlib-metadata>=6.7.0",
5858
"rich>=13.7.1",
59-
"nest_asyncio==1.6.0",
6059
"pytest-xdist>=3.6.1",
6160
]
6261

requirements-dev.lock

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ multidict==6.4.4
7575
mypy==1.14.1
7676
mypy-extensions==1.0.0
7777
# via mypy
78-
nest-asyncio==1.6.0
7978
nodeenv==1.8.0
8079
# via pyright
8180
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 finch import Finch, AsyncFinch, APIResponseValidationError
2522
from finch._types import Omit
23+
from finch._utils import asyncify
2624
from finch._models import BaseModel, FinalRequestOptions
2725
from finch._exceptions import APIStatusError, APIResponseValidationError
2826
from finch._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

@@ -1686,50 +1686,9 @@ def retry_handler(_request: httpx.Request) -> httpx.Response:
16861686
assert response.retries_taken == failures_before_success
16871687
assert int(response.http_request.headers.get("x-stainless-retry-count")) == failures_before_success
16881688

1689-
def test_get_platform(self) -> None:
1690-
# A previous implementation of asyncify could leave threads unterminated when
1691-
# used with nest_asyncio.
1692-
#
1693-
# Since nest_asyncio.apply() is global and cannot be un-applied, this
1694-
# test is run in a separate process to avoid affecting other tests.
1695-
test_code = dedent("""
1696-
import asyncio
1697-
import nest_asyncio
1698-
import threading
1699-
1700-
from finch._utils import asyncify
1701-
from finch._base_client import get_platform
1702-
1703-
async def test_main() -> None:
1704-
result = await asyncify(get_platform)()
1705-
print(result)
1706-
for thread in threading.enumerate():
1707-
print(thread.name)
1708-
1709-
nest_asyncio.apply()
1710-
asyncio.run(test_main())
1711-
""")
1712-
with subprocess.Popen(
1713-
[sys.executable, "-c", test_code],
1714-
text=True,
1715-
) as process:
1716-
timeout = 10 # seconds
1717-
1718-
start_time = time.monotonic()
1719-
while True:
1720-
return_code = process.poll()
1721-
if return_code is not None:
1722-
if return_code != 0:
1723-
raise AssertionError("calling get_platform using asyncify resulted in a non-zero exit code")
1724-
1725-
# success
1726-
break
1727-
1728-
if time.monotonic() - start_time > timeout:
1729-
process.kill()
1730-
raise AssertionError("calling get_platform using asyncify resulted in a hung process")
1731-
1732-
time.sleep(0.1)
1689+
async def test_get_platform(self) -> None:
1690+
platform = await asyncify(get_platform)()
1691+
assert isinstance(platform, (str, OtherPlatform))
17331692

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

0 commit comments

Comments
 (0)