Skip to content

Commit

Permalink
fix conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
Miguel Martin committed Jan 7, 2025
2 parents c92cad1 + ed80442 commit a27a579
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions tests/unit_tests/test_errors.py
Original file line number Diff line number Diff line change
Expand Up @@ -440,6 +440,7 @@ async def test_status_error_from_upstream(test_app: httpx.AsyncClient):


@respx.mock
@pytest.mark.asyncio
async def test_status_error_from_upstream_with_headers(
test_app: httpx.AsyncClient,
):
Expand Down Expand Up @@ -492,6 +493,7 @@ async def test_timeout_error_from_upstream(test_app: httpx.AsyncClient):


@respx.mock
@pytest.mark.asyncio
async def test_connection_error_from_upstream_non_streaming(
test_app: httpx.AsyncClient,
):
Expand Down Expand Up @@ -520,6 +522,7 @@ async def test_connection_error_from_upstream_non_streaming(


@respx.mock
@pytest.mark.asyncio
async def test_connection_error_from_upstream_streaming(
test_app: httpx.AsyncClient,
):
Expand Down Expand Up @@ -561,6 +564,7 @@ async def mock_stream() -> AsyncIterable[bytes]:


@respx.mock
@pytest.mark.asyncio
async def test_adapter_internal_error(
test_app: httpx.AsyncClient,
):
Expand Down Expand Up @@ -610,6 +614,7 @@ async def mock_stream() -> AsyncIterable[bytes]:


@respx.mock
@pytest.mark.asyncio
async def test_invalid_chunk_stream_from_upstream(
test_app: httpx.AsyncClient,
):
Expand Down Expand Up @@ -650,6 +655,7 @@ async def mock_stream() -> AsyncIterable[bytes]:


@respx.mock
@pytest.mark.asyncio
async def test_unexpected_multi_modal_input_streaming(
test_app: httpx.AsyncClient,
):
Expand Down

0 comments on commit a27a579

Please sign in to comment.