Skip to content

Commit dd4f6e1

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 499ed61 commit dd4f6e1

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 orb import Orb, AsyncOrb, APIResponseValidationError
2522
from orb._types import Omit
23+
from orb._utils import asyncify
2624
from orb._models import BaseModel, FinalRequestOptions
2725
from orb._exceptions import OrbError, APIStatusError, APITimeoutError, APIResponseValidationError
2826
from orb._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

@@ -1724,50 +1724,9 @@ def retry_handler(_request: httpx.Request) -> httpx.Response:
17241724
assert response.retries_taken == failures_before_success
17251725
assert int(response.http_request.headers.get("x-stainless-retry-count")) == failures_before_success
17261726

1727-
def test_get_platform(self) -> None:
1728-
# A previous implementation of asyncify could leave threads unterminated when
1729-
# used with nest_asyncio.
1730-
#
1731-
# Since nest_asyncio.apply() is global and cannot be un-applied, this
1732-
# test is run in a separate process to avoid affecting other tests.
1733-
test_code = dedent("""
1734-
import asyncio
1735-
import nest_asyncio
1736-
import threading
1737-
1738-
from orb._utils import asyncify
1739-
from orb._base_client import get_platform
1740-
1741-
async def test_main() -> None:
1742-
result = await asyncify(get_platform)()
1743-
print(result)
1744-
for thread in threading.enumerate():
1745-
print(thread.name)
1746-
1747-
nest_asyncio.apply()
1748-
asyncio.run(test_main())
1749-
""")
1750-
with subprocess.Popen(
1751-
[sys.executable, "-c", test_code],
1752-
text=True,
1753-
) as process:
1754-
timeout = 10 # seconds
1755-
1756-
start_time = time.monotonic()
1757-
while True:
1758-
return_code = process.poll()
1759-
if return_code is not None:
1760-
if return_code != 0:
1761-
raise AssertionError("calling get_platform using asyncify resulted in a non-zero exit code")
1762-
1763-
# success
1764-
break
1765-
1766-
if time.monotonic() - start_time > timeout:
1767-
process.kill()
1768-
raise AssertionError("calling get_platform using asyncify resulted in a hung process")
1769-
1770-
time.sleep(0.1)
1727+
async def test_get_platform(self) -> None:
1728+
platform = await asyncify(get_platform)()
1729+
assert isinstance(platform, (str, OtherPlatform))
17711730

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

0 commit comments

Comments
 (0)