Skip to content
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

Jump to bottom

Turn scope["client"] to None on TestClient #2377

Merged
merged 4 commits into from
Dec 25, 2023
Merged

Turn scope["client"] to None on TestClient #2377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f90a743
Remove client scope from testclient
aminalaee Dec 16, 2023
f44203c
remove test
aminalaee Dec 16, 2023
e0010c0
Merge branch 'master' into fix-testclient-client-scope
Kludex Dec 22, 2023
c5fa90c
Update testclient.py
aminalaee Dec 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions starlette/testclient.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ def handle_request(self, request: httpx.Request) -> httpx.Response:
"scheme": scheme,
"query_string": query.encode(),
"headers": headers,
"client": ["testclient", 50000],
"client": None,
"server": [host, port],
"subprotocols": subprotocols,
"state": self.app_state.copy(),
Expand All @@ -263,7 +263,7 @@ def handle_request(self, request: httpx.Request) -> httpx.Response:
"scheme": scheme,
"query_string": query.encode(),
"headers": headers,
"client": ["testclient", 50000],
"client": None,
"server": [host, port],
"extensions": {"http.response.debug": {}},
"state": self.app_state.copy(),
Expand Down
13 changes: 0 additions & 13 deletions tests/test_testclient.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,19 +254,6 @@ async def asgi(receive, send):
assert data == {"message": "test"}


def test_client(test_client_factory):
async def app(scope, receive, send):
client = scope.get("client")
assert client is not None
host, port = client
response = JSONResponse({"host": host, "port": port})
await response(scope, receive, send)

client = test_client_factory(app)
response = client.get("/")
assert response.json() == {"host": "testclient", "port": 50000}
Comment on lines -257 to -267
Copy link
Sponsor Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't see this test before... Can we have a background of why it exists?

Copy link
Member Author

@aminalaee aminalaee Dec 16, 2023 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was added here: #1462
I think it was not intentional, there’s another test in test_requests.py which is fine, but not needed for testclient.



@pytest.mark.parametrize("param", ("2020-07-14T00:00:00+00:00", "España", "voilà"))
def test_query_params(test_client_factory, param: str):
def homepage(request):
Expand Down