Skip to content

Commit d6ec18d

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 cd89671 commit d6ec18d

3 files changed

Lines changed: 6 additions & 49 deletions

File tree

‎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 maisa import Maisa, AsyncMaisa, APIResponseValidationError
2522
from maisa._types import Omit
23+
from maisa._utils import asyncify
2624
from maisa._models import BaseModel, FinalRequestOptions
2725
from maisa._exceptions import APIStatusError, APITimeoutError, APIResponseValidationError
2826
from maisa._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

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

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

1610-
def test_get_platform(self) -> None:
1611-
# A previous implementation of asyncify could leave threads unterminated when
1612-
# used with nest_asyncio.
1613-
#
1614-
# Since nest_asyncio.apply() is global and cannot be un-applied, this
1615-
# test is run in a separate process to avoid affecting other tests.
1616-
test_code = dedent("""
1617-
import asyncio
1618-
import nest_asyncio
1619-
import threading
1620-
1621-
from maisa._utils import asyncify
1622-
from maisa._base_client import get_platform
1623-
1624-
async def test_main() -> None:
1625-
result = await asyncify(get_platform)()
1626-
print(result)
1627-
for thread in threading.enumerate():
1628-
print(thread.name)
1629-
1630-
nest_asyncio.apply()
1631-
asyncio.run(test_main())
1632-
""")
1633-
with subprocess.Popen(
1634-
[sys.executable, "-c", test_code],
1635-
text=True,
1636-
) as process:
1637-
timeout = 10 # seconds
1638-
1639-
start_time = time.monotonic()
1640-
while True:
1641-
return_code = process.poll()
1642-
if return_code is not None:
1643-
if return_code != 0:
1644-
raise AssertionError("calling get_platform using asyncify resulted in a non-zero exit code")
1645-
1646-
# success
1647-
break
1648-
1649-
if time.monotonic() - start_time > timeout:
1650-
process.kill()
1651-
raise AssertionError("calling get_platform using asyncify resulted in a hung process")
1652-
1653-
time.sleep(0.1)
1610+
async def test_get_platform(self) -> None:
1611+
platform = await asyncify(get_platform)()
1612+
assert isinstance(platform, (str, OtherPlatform))
16541613

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

0 commit comments

Comments
 (0)