Skip to content

test: remove duplicate client tests and fix base URL coverage #4170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dpiet-oai merged 1 commit into from
Oct 26, 2026
+4 −101
Merged

test: remove duplicate client tests and fix base URL coverage #4170

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
105 changes: 4 additions & 101 deletions tests/test_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1244,13 +1244,13 @@ def test_base_url_trailing_slash(self, client: OpenAI) -> None:
"client",
[
OpenAI(
base_url="http://localhost:5000/custom/path/",
base_url="http://localhost:5000/custom/path",
api_key=api_key,
admin_api_key=admin_api_key,
_strict_response_validation=True,
),
OpenAI(
base_url="http://localhost:5000/custom/path/",
base_url="http://localhost:5000/custom/path",
api_key=api_key,
admin_api_key=admin_api_key,
_strict_response_validation=True,
Expand Down Expand Up @@ -2281,103 +2281,6 @@ async def test_hardcoded_query_params_in_url(self, async_client: AsyncOpenAI) ->
)
assert request.url.raw_path == b"/files/a%2Fb?beta=true&limit=10"

def test_request_extra_json(self, client: OpenAI) -> None:
request = client._build_request(
FinalRequestOptions(
method="post",
url="/foo",
json_data={"foo": "bar"},
extra_json={"baz": False},
),
)
data = json.loads(request.content.decode("utf-8"))
assert data == {"foo": "bar", "baz": False}

request = client._build_request(
FinalRequestOptions(
method="post",
url="/foo",
extra_json={"baz": False},
),
)
data = json.loads(request.content.decode("utf-8"))
assert data == {"baz": False}

# `extra_json` takes priority over `json_data` when keys clash
request = client._build_request(
FinalRequestOptions(
method="post",
url="/foo",
json_data={"foo": "bar", "baz": True},
extra_json={"baz": None},
),
)
data = json.loads(request.content.decode("utf-8"))
assert data == {"foo": "bar", "baz": None}

def test_request_extra_headers(self, client: OpenAI) -> None:
request = client._build_request(
FinalRequestOptions(
method="post",
url="/foo",
**make_request_options(extra_headers={"X-Foo": "Foo"}),
),
)
assert request.headers.get("X-Foo") == "Foo"

# `extra_headers` takes priority over `default_headers` when keys clash
request = client.with_options(default_headers={"X-Bar": "true"})._build_request(
FinalRequestOptions(
method="post",
url="/foo",
**make_request_options(
extra_headers={"X-Bar": "false"},
),
),
)
assert request.headers.get("X-Bar") == "false"

def test_request_extra_query(self, client: OpenAI) -> None:
request = client._build_request(
FinalRequestOptions(
method="post",
url="/foo",
**make_request_options(
extra_query={"my_query_param": "Foo"},
),
),
)
params = dict(request.url.params)
assert params == {"my_query_param": "Foo"}

# if both `query` and `extra_query` are given, they are merged
request = client._build_request(
FinalRequestOptions(
method="post",
url="/foo",
**make_request_options(
query={"bar": "1"},
extra_query={"foo": "2"},
),
),
)
params = dict(request.url.params)
assert params == {"bar": "1", "foo": "2"}

# `extra_query` takes priority over `query` when keys clash
request = client._build_request(
FinalRequestOptions(
method="post",
url="/foo",
**make_request_options(
query={"foo": "1"},
extra_query={"foo": "2"},
),
),
)
params = dict(request.url.params)
assert params == {"foo": "2"}

def test_multipart_repeating_array(self, async_client: AsyncOpenAI) -> None:
request = async_client._build_request(
FinalRequestOptions.construct(
Expand Down Expand Up @@ -2735,13 +2638,13 @@ async def test_base_url_trailing_slash(self, client: AsyncOpenAI) -> None:
"client",
[
AsyncOpenAI(
base_url="http://localhost:5000/custom/path/",
base_url="http://localhost:5000/custom/path",
api_key=api_key,
admin_api_key=admin_api_key,
_strict_response_validation=True,
),
AsyncOpenAI(
base_url="http://localhost:5000/custom/path/",
base_url="http://localhost:5000/custom/path",
api_key=api_key,
admin_api_key=admin_api_key,
_strict_response_validation=True,
Expand Down
Loading