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.

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

Fix TestReconcileBatchJob #2350

Merged
merged 10 commits into from
Jun 14, 2024
Merged

Conversation

forsaken628
Copy link
Contributor

What this PR does / why we need it:
Fix unstable tests
Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
#1649

Checklist:

  • Docs included if any changes are user facing

Signed-off-by: forsaken628 <[email protected]>
Signed-off-by: forsaken628 <[email protected]>
Signed-off-by: forsaken628 <[email protected]>
Signed-off-by: forsaken628 <[email protected]>
Signed-off-by: forsaken628 <[email protected]>
Signed-off-by: forsaken628 <[email protected]>
Signed-off-by: forsaken628 <[email protected]>
Signed-off-by: forsaken628 <[email protected]>
Signed-off-by: forsaken628 <[email protected]>
@tenzen-y
Copy link
Member

@forsaken628 Thank you for this contribution.
Could you explain the reason why the flakiness happened and what you fixed the root cause in the PR description?

@forsaken628
Copy link
Contributor Author

According to the previous logic,call GetTrialObservationLog will return observationLogAvailable once and then observationLogUnavailable multiple times.

I investigated the cause of the failure in the ci environment: in test 2, which should have returned observationLogAvailable, it actually returned observationLogUnavailable, indicating that GetTrialObservationLog was accidentally called once somewhere.

Instead of locating where the accident occurred, I rewrote mockManagerClient to always return the same reply before calling DeleteTrialObservationLog, which I think is consistent with the semantics of ManagerClient.

@tenzen-y
Copy link
Member

According to the previous logic,call GetTrialObservationLog will return observationLogAvailable once and then observationLogUnavailable multiple times.

I investigated the cause of the failure in the ci environment: in test 2, which should have returned observationLogAvailable, it actually returned observationLogUnavailable, indicating that GetTrialObservationLog was accidentally called once somewhere.

Instead of locating where the accident occurred, I rewrote mockManagerClient to always return the same reply before calling DeleteTrialObservationLog, which I think is consistent with the semantics of ManagerClient.

Thank you for clarifying the root cause. It seems that you split out multiple test case into dedicated case based on the result of the GetTrialObservationLog. That sounds reasonable.

Copy link
Member

@tenzen-y tenzen-y Jun 13, 2024

Choose a reason for hiding this comment

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

TBH, we should reimplement these tests as ginkgo BDD style, but that is out of scope of this PR.
So, I leave such refactoring in the future.

mockManagerClient.EXPECT().DeleteTrialObservationLog(gomock.Any()).Return(nil, nil).AnyTimes()
t.Run(`Trial run with "Failed" BatchJob.`, func(t *testing.T) {
g := gomega.NewGomegaWithT(t)
mockMC.msg = observationLogUnavailable
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
mockMC.msg = observationLogUnavailable
mockManagerClient.EXPECT().GetTrialObservationLog(gomock.Any()).Return(observationLogAvailable, nil).AnyTimes()

Instead of this original mock client, can we reuse the autogenerated mock clients like this?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

We need WithOverridableExpectations here, but github.com/golang/mock/mock does not support this feature.
Or "Each test should create a new Controller".
In my opinion, gomock is not flexible enough, and it complicates a simple thing for this scenario.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Finally, I found another way.

Copy link
Member

Choose a reason for hiding this comment

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

@forsaken628 I opened the issue to replace gomock with go.uber.com/gomock here: #2356

As a separate PR, could you work on the issue?

pkg/controller.v1beta1/trial/trial_controller_test.go Outdated Show resolved Hide resolved
pkg/controller.v1beta1/trial/trial_controller_test.go Outdated Show resolved Hide resolved
Signed-off-by: forsaken628 <[email protected]>
Copy link
Member

@tenzen-y tenzen-y left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

Thank you for the great contribution!

Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: tenzen-y

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@andreyvelich
Copy link
Member

Thank you for this amazing contribution @forsaken628!
I really hope it will improve our unstable tests.

@forsaken628 forsaken628 deleted the test-failed branch June 14, 2024 15:20
andreyvelich pushed a commit to andreyvelich/katib that referenced this pull request Jun 18, 2024
* update

Signed-off-by: forsaken628 <[email protected]>

* fix

Signed-off-by: forsaken628 <[email protected]>

* update

Signed-off-by: forsaken628 <[email protected]>

* update

Signed-off-by: forsaken628 <[email protected]>

* update

Signed-off-by: forsaken628 <[email protected]>

* fix

Signed-off-by: forsaken628 <[email protected]>

* cleanup

Signed-off-by: forsaken628 <[email protected]>

* fix

Signed-off-by: forsaken628 <[email protected]>

* update

Signed-off-by: forsaken628 <[email protected]>

* use gomock

Signed-off-by: forsaken628 <[email protected]>

---------

Signed-off-by: forsaken628 <[email protected]>
andreyvelich pushed a commit to andreyvelich/katib that referenced this pull request Jun 18, 2024
* update

Signed-off-by: forsaken628 <[email protected]>

* fix

Signed-off-by: forsaken628 <[email protected]>

* update

Signed-off-by: forsaken628 <[email protected]>

* update

Signed-off-by: forsaken628 <[email protected]>

* update

Signed-off-by: forsaken628 <[email protected]>

* fix

Signed-off-by: forsaken628 <[email protected]>

* cleanup

Signed-off-by: forsaken628 <[email protected]>

* fix

Signed-off-by: forsaken628 <[email protected]>

* update

Signed-off-by: forsaken628 <[email protected]>

* use gomock

Signed-off-by: forsaken628 <[email protected]>

---------

Signed-off-by: forsaken628 <[email protected]>
Signed-off-by: Andrey Velichkevich <[email protected]>
google-oss-prow bot pushed a commit that referenced this pull request Jun 18, 2024
…branch (#2362)

* Fix TestReconcileBatchJob (#2350)

* update

Signed-off-by: forsaken628 <[email protected]>

* fix

Signed-off-by: forsaken628 <[email protected]>

* update

Signed-off-by: forsaken628 <[email protected]>

* update

Signed-off-by: forsaken628 <[email protected]>

* update

Signed-off-by: forsaken628 <[email protected]>

* fix

Signed-off-by: forsaken628 <[email protected]>

* cleanup

Signed-off-by: forsaken628 <[email protected]>

* fix

Signed-off-by: forsaken628 <[email protected]>

* update

Signed-off-by: forsaken628 <[email protected]>

* use gomock

Signed-off-by: forsaken628 <[email protected]>

---------

Signed-off-by: forsaken628 <[email protected]>
Signed-off-by: Andrey Velichkevich <[email protected]>

* Use cache-dependency-path in actions/setup-go for CI workflow (#2355)

Signed-off-by: forsaken628 <[email protected]>
Signed-off-by: Andrey Velichkevich <[email protected]>

* Replace already closed github.com/golang/mock with go.uber.org/mock (#2357)

* replace gomock

Signed-off-by: forsaken628 <[email protected]>

* fix

Signed-off-by: forsaken628 <[email protected]>

* revert

Signed-off-by: forsaken628 <[email protected]>

* fix

Signed-off-by: forsaken628 <[email protected]>

* fix

Signed-off-by: forsaken628 <[email protected]>

---------

Signed-off-by: forsaken628 <[email protected]>
Signed-off-by: Andrey Velichkevich <[email protected]>

* Replace gRPC code generation tool from Znly/protoc to Buf  (#2344)

* Replace gRPC code generation tool from Znly/protoc to Buf

Signed-off-by: forsaken628 <[email protected]>

* fix

Signed-off-by: forsaken628 <[email protected]>

* del build.sh

Signed-off-by: forsaken628 <[email protected]>

* cleanup

Signed-off-by: forsaken628 <[email protected]>

* fix test

Signed-off-by: forsaken628 <[email protected]>

* fix

Signed-off-by: forsaken628 <[email protected]>

* fix

Signed-off-by: forsaken628 <[email protected]>

* refine

Signed-off-by: forsaken628 <[email protected]>

* fix

Signed-off-by: forsaken628 <[email protected]>

* rm outter yaml

Signed-off-by: forsaken628 <[email protected]>

* fix

Signed-off-by: forsaken628 <[email protected]>

---------

Signed-off-by: forsaken628 <[email protected]>
Signed-off-by: Andrey Velichkevich <[email protected]>

* Upgrade the protobuf version to >=4.21.12,<5 (#2358)

Signed-off-by: Yuki Iwai <[email protected]>
Signed-off-by: Andrey Velichkevich <[email protected]>

* [SDK] Fix empty list for env variables and numpy version (#2360)

* [SDK] Fix empty list for env variables

Signed-off-by: Andrey Velichkevich <[email protected]>

* Fix numpy version in tests

Signed-off-by: Andrey Velichkevich <[email protected]>

---------

Signed-off-by: Andrey Velichkevich <[email protected]>

---------

Signed-off-by: forsaken628 <[email protected]>
Signed-off-by: Andrey Velichkevich <[email protected]>
Signed-off-by: Yuki Iwai <[email protected]>
Co-authored-by: coldWater <[email protected]>
Co-authored-by: Yuki Iwai <[email protected]>
shashank-iitbhu pushed a commit to shashank-iitbhu/katib that referenced this pull request Jun 19, 2024
* update

Signed-off-by: forsaken628 <[email protected]>

* fix

Signed-off-by: forsaken628 <[email protected]>

* update

Signed-off-by: forsaken628 <[email protected]>

* update

Signed-off-by: forsaken628 <[email protected]>

* update

Signed-off-by: forsaken628 <[email protected]>

* fix

Signed-off-by: forsaken628 <[email protected]>

* cleanup

Signed-off-by: forsaken628 <[email protected]>

* fix

Signed-off-by: forsaken628 <[email protected]>

* update

Signed-off-by: forsaken628 <[email protected]>

* use gomock

Signed-off-by: forsaken628 <[email protected]>

---------

Signed-off-by: forsaken628 <[email protected]>
shashank-iitbhu pushed a commit to shashank-iitbhu/katib that referenced this pull request Jun 30, 2024
* update

Signed-off-by: forsaken628 <[email protected]>

* fix

Signed-off-by: forsaken628 <[email protected]>

* update

Signed-off-by: forsaken628 <[email protected]>

* update

Signed-off-by: forsaken628 <[email protected]>

* update

Signed-off-by: forsaken628 <[email protected]>

* fix

Signed-off-by: forsaken628 <[email protected]>

* cleanup

Signed-off-by: forsaken628 <[email protected]>

* fix

Signed-off-by: forsaken628 <[email protected]>

* update

Signed-off-by: forsaken628 <[email protected]>

* use gomock

Signed-off-by: forsaken628 <[email protected]>

---------

Signed-off-by: forsaken628 <[email protected]>
shashank-iitbhu pushed a commit to shashank-iitbhu/katib that referenced this pull request Jul 25, 2024
* update

Signed-off-by: forsaken628 <[email protected]>

* fix

Signed-off-by: forsaken628 <[email protected]>

* update

Signed-off-by: forsaken628 <[email protected]>

* update

Signed-off-by: forsaken628 <[email protected]>

* update

Signed-off-by: forsaken628 <[email protected]>

* fix

Signed-off-by: forsaken628 <[email protected]>

* cleanup

Signed-off-by: forsaken628 <[email protected]>

* fix

Signed-off-by: forsaken628 <[email protected]>

* update

Signed-off-by: forsaken628 <[email protected]>

* use gomock

Signed-off-by: forsaken628 <[email protected]>

---------

Signed-off-by: forsaken628 <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants