Skip to content

Commit 0cced81

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 baa06e6 commit 0cced81

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,14 +6,11 @@
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
import urllib.parse
1513
from typing import Any, Union, cast
16-
from textwrap import dedent
1714
from unittest import mock
1815
from typing_extensions import Literal
1916

@@ -24,14 +21,17 @@
2421

2522
from onebusaway import OnebusawaySDK, AsyncOnebusawaySDK, APIResponseValidationError
2623
from onebusaway._types import Omit
24+
from onebusaway._utils import asyncify
2725
from onebusaway._models import BaseModel, FinalRequestOptions
2826
from onebusaway._exceptions import APIStatusError, APITimeoutError, APIResponseValidationError
2927
from onebusaway._base_client import (
3028
DEFAULT_TIMEOUT,
3129
HTTPX_DEFAULT_TIMEOUT,
3230
BaseClient,
31+
OtherPlatform,
3332
DefaultHttpxClient,
3433
DefaultAsyncHttpxClient,
34+
get_platform,
3535
make_request_options,
3636
)
3737

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

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

1631-
def test_get_platform(self) -> None:
1632-
# A previous implementation of asyncify could leave threads unterminated when
1633-
# used with nest_asyncio.
1634-
#
1635-
# Since nest_asyncio.apply() is global and cannot be un-applied, this
1636-
# test is run in a separate process to avoid affecting other tests.
1637-
test_code = dedent("""
1638-
import asyncio
1639-
import nest_asyncio
1640-
import threading
1641-
1642-
from onebusaway._utils import asyncify
1643-
from onebusaway._base_client import get_platform
1644-
1645-
async def test_main() -> None:
1646-
result = await asyncify(get_platform)()
1647-
print(result)
1648-
for thread in threading.enumerate():
1649-
print(thread.name)
1650-
1651-
nest_asyncio.apply()
1652-
asyncio.run(test_main())
1653-
""")
1654-
with subprocess.Popen(
1655-
[sys.executable, "-c", test_code],
1656-
text=True,
1657-
) as process:
1658-
timeout = 10 # seconds
1659-
1660-
start_time = time.monotonic()
1661-
while True:
1662-
return_code = process.poll()
1663-
if return_code is not None:
1664-
if return_code != 0:
1665-
raise AssertionError("calling get_platform using asyncify resulted in a non-zero exit code")
1666-
1667-
# success
1668-
break
1669-
1670-
if time.monotonic() - start_time > timeout:
1671-
process.kill()
1672-
raise AssertionError("calling get_platform using asyncify resulted in a hung process")
1673-
1674-
time.sleep(0.1)
1631+
async def test_get_platform(self) -> None:
1632+
platform = await asyncify(get_platform)()
1633+
assert isinstance(platform, (str, OtherPlatform))
16751634

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

0 commit comments

Comments
 (0)