fix: disable WatchListClient for envtest-based tests to fix unit test timeouts #3756
Merged
openshift-merge-bot[bot] merged 1 commit intooperator-framework:masterfrom Feb 2, 2026
Merged
Conversation
Contributor
|
I had to add something similar to one of my unit tests for TLS Profiles. |
Contributor
|
/lgtm |
Contributor
|
/approve |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: tmshort The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
2ab26dd
into
operator-framework:master
14 checks passed
Merged
1 task
9 tasks
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.
Description of the change:
This PR fixes the unit test timeouts in pkg/controller/operators and pkg/controller/operators/openshift packages that occur after the K8s 1.35 upgrade.
Motivation for the change:
To address openshift/operator-framework-olm#1208 (comment)
Architectural changes:
After upgrading to K8s 1.35, the WatchListClient feature gate is enabled by default. However, envtest environments don't fully support WatchList semantics, causing informer caches to hang indefinitely while waiting for sync. This results in test timeouts after 10 minutes:
Add TestMain function to disable the WatchListClient feature gate before tests run, forcing informers to use the traditional List+Watch behavior instead of the new WatchList semantics.
Testing remarks:
Reviewer Checklist
/doc[FLAKE]are truly flaky and have an issueAssisted-By: Claude-COde