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

Vendor golang/mock@v1.6.0 #4210

Merged
merged 2 commits into from Jun 14, 2021
Merged

Vendor golang/mock@v1.6.0 #4210

merged 2 commits into from Jun 14, 2021

Conversation

timebertt
Copy link
Member

@timebertt timebertt commented Jun 14, 2021

How to categorize this PR?

/area testing
/kind task

What this PR does / why we need it:

Vendor golang/mock@v1.6.0 and adapts our tests to the changed behavior.

Which issue(s) this PR fixes:
Fixes #

Special notes for your reviewer:

First commit is basically go mod edit -require=github.com/golang/mock@v1.6.0 && make revendor, the second one is the actual adaption.

/squash

Release note:


There were a lot of DoAndReturn usages in our tests that didn't correctly use the
client func signatures. With golang/mock#558 this is now validated and tests
fail, if the signature of the provided func literal is not the same as the one of
the real func. This commit fixes our wrong usages to comply with the newest
gomock behavior.
@timebertt timebertt requested a review from a team as a code owner June 14, 2021 08:13
@gardener-robot gardener-robot added area/testing Testing related kind/task General task merge/squash size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jun 14, 2021
Copy link
Member

@rfranzke rfranzke left a comment

Choose a reason for hiding this comment

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

/lgtm

Copy link
Member

@ialidzhikov ialidzhikov left a comment

Choose a reason for hiding this comment

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

/lgtm

@rfranzke
Copy link
Member

/milestone v1.25

@gardener-robot gardener-robot added this to the v1.25 milestone Jun 14, 2021
@rfranzke rfranzke merged commit 0d91f8e into gardener:master Jun 14, 2021
@timebertt timebertt deleted the vendor/gomock branch June 14, 2021 14:32
krgostev pushed a commit to krgostev/gardener that referenced this pull request Apr 21, 2022
* Vendor golang/mock@v1.6.0

* Fix wrong DoAndReturn usages

There were a lot of DoAndReturn usages in our tests that didn't correctly use the
client func signatures. With golang/mock#558 this is now validated and tests
fail, if the signature of the provided func literal is not the same as the one of
the real func. This commit fixes our wrong usages to comply with the newest
gomock behavior.
krgostev pushed a commit to krgostev/gardener that referenced this pull request Jul 5, 2022
* Vendor golang/mock@v1.6.0

* Fix wrong DoAndReturn usages

There were a lot of DoAndReturn usages in our tests that didn't correctly use the
client func signatures. With golang/mock#558 this is now validated and tests
fail, if the signature of the provided func literal is not the same as the one of
the real func. This commit fixes our wrong usages to comply with the newest
gomock behavior.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/testing Testing related kind/task General task size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants