Migrate linkerd + istio v1 tests off requests_mock#23648
Open
mwdd146980 wants to merge 1 commit intoDataDog:mwdd146980/httpx-migration-basefrom
Open
Migrate linkerd + istio v1 tests off requests_mock#23648mwdd146980 wants to merge 1 commit intoDataDog:mwdd146980/httpx-migration-basefrom
mwdd146980 wants to merge 1 commit intoDataDog:mwdd146980/httpx-migration-basefrom
Conversation
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: ce89c1420f
ℹ️ About Codex in GitHub
Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".
Codecov Report✅ All modified and coverable lines are covered by tests.
Additional details and impacted files🚀 New features to boost your workflow:
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Motivation
Step 6 PR 6.1 of the httpx test-decoupling migration. Two integrations still mock at the
requestslayer viarequests_mock.Mocker(), which couples test mocks to the underlying HTTP library and blocks the eventualrequests→httpxswap.Plan: https://datadoghq.atlassian.net/wiki/spaces/AI/pages/6692406054
Approach
Replace
requests_mock.Mocker()withmock_openmetrics_http(the OpenMetrics v1 mixin fixture that patchesOpenMetricsScraperMixin.get_http_handler) andMockHTTPResponse. v2 tests already usemock_http_responseand are unchanged.Pattern A (text response):
Pattern B (exception): set
mock_openmetrics_http.get.side_effect.7 tests across 2 files: linkerd/tests/test_linkerd.py (3 v1 tests), istio/tests/test_unit_istio_v1.py (4 tests).
Verification
ddev test -fs linkerd istio— clean.ddev --no-interactive test linkerd— 4 passed, 1 e2e skipped.ddev --no-interactive test istio— 24 passed, 2 e2e skipped.Stacked on
mwdd146980/httpx-migration-base.