e2e: fix a race in [reboots] tests. #439
Conversation
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: jmencak 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 |
openshift-ci
bot
added
the
approved
|
/assign @dagrayvid |
|
/hold |
openshift-ci
bot
added
the
do-not-merge/hold
jmencak
force-pushed
the
4.12-fix-e2e-races
branch
from
60995de
to
b1788b1
Compare
|
/hold cancel |
openshift-ci
bot
removed
the
do-not-merge/hold
|
#438 merged |
| ginkgo.By("waiting for worker-rt MachineConfigPool UpdatedMachineCount == 1") | ||
| err = util.WaitForPoolUpdatedMachineCount(cs, "worker-rt", 1) | ||
| gomega.Expect(err).NotTo(gomega.HaveOccurred()) | ||
| waitForMCPFlip := func() { |
There was a problem hiding this comment.
Can we define this function somewhere else (e.g. test/e2e/util/util.go) and call it in all the spots this is being done in this PR?
There was a problem hiding this comment.
Thank you for looking, David. I don't think this function has a place in test/e2e/util/util.go. I don't think I want to see any ginkgo.By() and gomega.Expect() there. Moving to operator_test.go, hopefully you're fine with that.
There was a problem hiding this comment.
That makes sense, thanks.
I wanted to avoid duplicating these ~6 lines more than a couple times, and this accomplishes that.
Wait for a flip to MachineConfigPool UpdatedMachineCount == 0 prior to waiting for it to be updated (== 1) again.
jmencak
force-pushed
the
4.12-fix-e2e-races
branch
from
b1788b1
to
775aee1
Compare
|
/lgtm |
|
@jmencak: all tests passed! Full PR test history. Your PR dashboard. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here. |
Wait for a flip to MachineConfigPool UpdatedMachineCount == 0 prior to waiting for it to be updated (== 1) again. Co-authored-by: Jiri Mencak <jmencak@users.noreply.github.com>
Wait for a flip to MachineConfigPool UpdatedMachineCount == 0 prior to waiting for it to be updated (== 1) again. Co-authored-by: Jiri Mencak <jmencak@users.noreply.github.com>
Wait for a flip to MachineConfigPool UpdatedMachineCount == 0 prior to
waiting for it to be updated (== 1) again.